@std-uritemplate/std-uritemplate - npm Package Compare versions

Comparing version 0.0.39 to 0.0.40

dist/index.d.ts

@@ -8,3 +8,3 @@ type Substitutions = {
     private static getMaxChar;
-    private static getModifier;
+    private static getOperator;
     private static expandImpl;
@@ -11,0 +11,0 @@ private static addPrefix;

dist/index.js

 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.StdUriTemplate = void 0;
-var Modifier;
-(function (Modifier) {
-    Modifier[Modifier["NO_MOD"] = 0] = "NO_MOD";
-    Modifier[Modifier["PLUS"] = 1] = "PLUS";
-    Modifier[Modifier["HASH"] = 2] = "HASH";
-    Modifier[Modifier["DOT"] = 3] = "DOT";
-    Modifier[Modifier["SLASH"] = 4] = "SLASH";
-    Modifier[Modifier["SEMICOLON"] = 5] = "SEMICOLON";
-    Modifier[Modifier["QUESTION_MARK"] = 6] = "QUESTION_MARK";
-    Modifier[Modifier["AMP"] = 7] = "AMP";
-})(Modifier || (Modifier = {}));
+var Operator;
+(function (Operator) {
+    Operator[Operator["NO_OP"] = 0] = "NO_OP";
+    Operator[Operator["PLUS"] = 1] = "PLUS";
+    Operator[Operator["HASH"] = 2] = "HASH";
+    Operator[Operator["DOT"] = 3] = "DOT";
+    Operator[Operator["SLASH"] = 4] = "SLASH";
+    Operator[Operator["SEMICOLON"] = 5] = "SEMICOLON";
+    Operator[Operator["QUESTION_MARK"] = 6] = "QUESTION_MARK";
+    Operator[Operator["AMP"] = 7] = "AMP";
+})(Operator || (Operator = {}));
 var SubstitutionType;
@@ -66,22 +66,22 @@ (function (SubstitutionType) {
     }
-    static getModifier(c, token, col) {
+    static getOperator(c, token, col) {
         switch (c) {
             case '+':
-                return Modifier.PLUS;
+                return Operator.PLUS;
             case '#':
-                return Modifier.HASH;
+                return Operator.HASH;
             case '.':
-                return Modifier.DOT;
+                return Operator.DOT;
             case '/':
-                return Modifier.SLASH;
+                return Operator.SLASH;
             case ';':
-                return Modifier.SEMICOLON;
+                return Operator.SEMICOLON;
             case '?':
-                return Modifier.QUESTION_MARK;
+                return Operator.QUESTION_MARK;
             case '&':
-                return Modifier.AMP;
+                return Operator.AMP;
             default:
                 StdUriTemplate.validateLiteral(c, col);
                 token.push(c);
-                return Modifier.NO_MOD;
+                return Operator.NO_OP;
         }
@@ -92,3 +92,3 @@ }
         let token = null;
-        let modifier = null;
+        let operator = null;
         let composite = false;
@@ -106,3 +106,3 @@ let maxCharBuffer = null;
                     if (token !== null) {
-                        const expanded = StdUriTemplate.expandToken(modifier, token.join(''), composite, StdUriTemplate.getMaxChar(maxCharBuffer, i), firstToken, substitutions, result, i);
+                        const expanded = StdUriTemplate.expandToken(operator, token.join(''), composite, StdUriTemplate.getMaxChar(maxCharBuffer, i), firstToken, substitutions, result, i);
                         if (expanded && firstToken) {
@@ -112,3 +112,3 @@ firstToken = false;
                         token = null;
-                        modifier = null;
+                        operator = null;
                         composite = false;
@@ -123,3 +123,3 @@ maxCharBuffer = null;
                     if (token !== null) {
-                        const expanded = StdUriTemplate.expandToken(modifier, token.join(''), composite, StdUriTemplate.getMaxChar(maxCharBuffer, i), firstToken, substitutions, result, i);
+                        const expanded = StdUriTemplate.expandToken(operator, token.join(''), composite, StdUriTemplate.getMaxChar(maxCharBuffer, i), firstToken, substitutions, result, i);
                         if (expanded && firstToken) {
@@ -136,4 +136,4 @@ firstToken = false;
                     if (token !== null) {
-                        if (modifier === null) {
-                            modifier = StdUriTemplate.getModifier(character, token, i);
+                        if (operator === null) {
+                            operator = StdUriTemplate.getOperator(character, token, i);
                         }
@@ -174,20 +174,20 @@ else if (maxCharBuffer !== null) {
     }
-    static addPrefix(mod, result) {
-        switch (mod) {
-            case Modifier.HASH:
+    static addPrefix(op, result) {
+        switch (op) {
+            case Operator.HASH:
                 result.push('#');
                 break;
-            case Modifier.DOT:
+            case Operator.DOT:
                 result.push('.');
                 break;
-            case Modifier.SLASH:
+            case Operator.SLASH:
                 result.push('/');
                 break;
-            case Modifier.SEMICOLON:
+            case Operator.SEMICOLON:
                 result.push(';');
                 break;
-            case Modifier.QUESTION_MARK:
+            case Operator.QUESTION_MARK:
                 result.push('?');
                 break;
-            case Modifier.AMP:
+            case Operator.AMP:
                 result.push('&');
@@ -199,15 +199,15 @@ break;
     }
-    static addSeparator(mod, result) {
-        switch (mod) {
-            case Modifier.DOT:
+    static addSeparator(op, result) {
+        switch (op) {
+            case Operator.DOT:
                 result.push('.');
                 break;
-            case Modifier.SLASH:
+            case Operator.SLASH:
                 result.push('/');
                 break;
-            case Modifier.SEMICOLON:
+            case Operator.SEMICOLON:
                 result.push(';');
                 break;
-            case Modifier.QUESTION_MARK:
-            case Modifier.AMP:
+            case Operator.QUESTION_MARK:
+            case Operator.AMP:
                 result.push('&');
@@ -220,14 +220,14 @@ break;
     }
-    static addValue(mod, token, value, result, maxChar) {
-        switch (mod) {
-            case Modifier.PLUS:
-            case Modifier.HASH:
+    static addValue(op, token, value, result, maxChar) {
+        switch (op) {
+            case Operator.PLUS:
+            case Operator.HASH:
                 StdUriTemplate.addExpandedValue(value, result, maxChar, false);
                 break;
-            case Modifier.QUESTION_MARK:
-            case Modifier.AMP:
+            case Operator.QUESTION_MARK:
+            case Operator.AMP:
                 result.push(`${token}=`);
                 StdUriTemplate.addExpandedValue(value, result, maxChar, true);
                 break;
-            case Modifier.SEMICOLON:
+            case Operator.SEMICOLON:
                 result.push(token);
@@ -239,5 +239,5 @@ if (value.length > 0) {
                 break;
-            case Modifier.DOT:
-            case Modifier.SLASH:
-            case Modifier.NO_MOD:
+            case Operator.DOT:
+            case Operator.SLASH:
+            case Operator.NO_OP:
                 StdUriTemplate.addExpandedValue(value, result, maxChar, true);
@@ -247,14 +247,14 @@ break;
     }
-    static addValueElement(mod, token, value, result, maxChar) {
-        switch (mod) {
-            case Modifier.PLUS:
-            case Modifier.HASH:
+    static addValueElement(op, token, value, result, maxChar) {
+        switch (op) {
+            case Operator.PLUS:
+            case Operator.HASH:
                 StdUriTemplate.addExpandedValue(value, result, maxChar, false);
                 break;
-            case Modifier.QUESTION_MARK:
-            case Modifier.AMP:
-            case Modifier.SEMICOLON:
-            case Modifier.DOT:
-            case Modifier.SLASH:
-            case Modifier.NO_MOD:
+            case Operator.QUESTION_MARK:
+            case Operator.AMP:
+            case Operator.SEMICOLON:
+            case Operator.DOT:
+            case Operator.SLASH:
+            case Operator.NO_OP:
                 StdUriTemplate.addExpandedValue(value, result, maxChar, true);
@@ -364,3 +364,3 @@ break;
     }
-    static expandToken(modifier, token, composite, maxChar, firstToken, substitutions, result, col) {
+    static expandToken(operator, token, composite, maxChar, firstToken, substitutions, result, col) {
         if (token.length === 0) {
@@ -381,16 +381,16 @@ throw new Error(`Found an empty token at col: ${col}`);
         if (firstToken) {
-            StdUriTemplate.addPrefix(modifier, result);
+            StdUriTemplate.addPrefix(operator, result);
         }
         else {
-            StdUriTemplate.addSeparator(modifier, result);
+            StdUriTemplate.addSeparator(operator, result);
         }
         switch (substType) {
             case SubstitutionType.STRING:
-                StdUriTemplate.addStringValue(modifier, token, value, result, maxChar);
+                StdUriTemplate.addStringValue(operator, token, value, result, maxChar);
                 break;
             case SubstitutionType.LIST:
-                StdUriTemplate.addListValue(modifier, token, value, result, maxChar, composite);
+                StdUriTemplate.addListValue(operator, token, value, result, maxChar, composite);
                 break;
             case SubstitutionType.MAP:
-                StdUriTemplate.addMapValue(modifier, token, value, result, maxChar, composite);
+                StdUriTemplate.addMapValue(operator, token, value, result, maxChar, composite);
                 break;
@@ -400,10 +400,10 @@ }
     }
-    static addStringValue(modifier, token, value, result, maxChar) {
-        StdUriTemplate.addValue(modifier, token, value, result, maxChar);
+    static addStringValue(operator, token, value, result, maxChar) {
+        StdUriTemplate.addValue(operator, token, value, result, maxChar);
     }
-    static addListValue(modifier, token, value, result, maxChar, composite) {
+    static addListValue(operator, token, value, result, maxChar, composite) {
         let first = true;
         for (const v of value) {
             if (first) {
-                StdUriTemplate.addValue(modifier, token, v, result, maxChar);
+                StdUriTemplate.addValue(operator, token, v, result, maxChar);
                 first = false;
@@ -413,8 +413,8 @@ }
                 if (composite) {
-                    StdUriTemplate.addSeparator(modifier, result);
-                    StdUriTemplate.addValue(modifier, token, v, result, maxChar);
+                    StdUriTemplate.addSeparator(operator, result);
+                    StdUriTemplate.addValue(operator, token, v, result, maxChar);
                 }
                 else {
                     result.push(',');
-                    StdUriTemplate.addValueElement(modifier, token, v, result, maxChar);
+                    StdUriTemplate.addValueElement(operator, token, v, result, maxChar);
                 }
@@ -424,3 +424,3 @@ }
     }
-    static addMapValue(modifier, token, value, result, maxChar, composite) {
+    static addMapValue(operator, token, value, result, maxChar, composite) {
         let first = true;
@@ -434,5 +434,5 @@ if (maxChar !== -1) {
                 if (!first) {
-                    StdUriTemplate.addSeparator(modifier, result);
+                    StdUriTemplate.addSeparator(operator, result);
                 }
-                StdUriTemplate.addValueElement(modifier, token, key, result, maxChar);
+                StdUriTemplate.addValueElement(operator, token, key, result, maxChar);
                 result.push('=');
@@ -442,11 +442,11 @@ }
                 if (first) {
-                    StdUriTemplate.addValue(modifier, token, key, result, maxChar);
+                    StdUriTemplate.addValue(operator, token, key, result, maxChar);
                 }
                 else {
                     result.push(',');
-                    StdUriTemplate.addValueElement(modifier, token, key, result, maxChar);
+                    StdUriTemplate.addValueElement(operator, token, key, result, maxChar);
                 }
                 result.push(',');
             }
-            StdUriTemplate.addValueElement(modifier, token, v, result, maxChar);
+            StdUriTemplate.addValueElement(operator, token, v, result, maxChar);
             first = false;
@@ -453,0 +453,0 @@ }

package.json

 {
   "name": "@std-uritemplate/std-uritemplate",
-  "version": "0.0.39",
+  "version": "0.0.40",
   "description": "std-uritemplate implementation for TS/JS",
@@ -5,0 +5,0 @@ "scripts": {

Readme.md

@@ -125,7 +125,3 @@ # std-uritemplate
 ```csharp
-using stduritemplate;
-
-...
-
-StdUriTemplate.Expand(template, substitutions);
+Std.UriTemplate.Expand(template, substitutions);
 ```
@@ -132,0 +128,0 @@

src/index.ts

 type Substitutions = { [key: string]: any };
 
-enum Modifier {
-  NO_MOD,
+enum Operator {
+  NO_OP,
   PLUS,
@@ -66,22 +66,22 @@ HASH,
 
-  private static getModifier(c: string, token: string[], col: number): Modifier {
+  private static getOperator(c: string, token: string[], col: number): Operator {
     switch (c) {
       case '+':
-        return Modifier.PLUS;
+        return Operator.PLUS;
       case '#':
-        return Modifier.HASH;
+        return Operator.HASH;
       case '.':
-        return Modifier.DOT;
+        return Operator.DOT;
       case '/':
-        return Modifier.SLASH;
+        return Operator.SLASH;
       case ';':
-        return Modifier.SEMICOLON;
+        return Operator.SEMICOLON;
       case '?':
-        return Modifier.QUESTION_MARK;
+        return Operator.QUESTION_MARK;
       case '&':
-        return Modifier.AMP;
+        return Operator.AMP;
       default:
         StdUriTemplate.validateLiteral(c, col);
         token.push(c);
-        return Modifier.NO_MOD;
+        return Operator.NO_OP;
     }
@@ -93,3 +93,3 @@ }
     let token: string[] | null = null;
-    let modifier: Modifier | null = null;
+    let operator: Operator | null = null;
     let composite = false;
@@ -109,3 +109,3 @@ let maxCharBuffer: string[] | null = null;
             const expanded = StdUriTemplate.expandToken(
-              modifier,
+              operator,
               token.join(''),
@@ -123,3 +123,3 @@ composite,
             token = null;
-            modifier = null;
+            operator = null;
             composite = false;
@@ -134,3 +134,3 @@ maxCharBuffer = null;
             const expanded = StdUriTemplate.expandToken(
-              modifier,
+              operator,
               token.join(''),
@@ -155,4 +155,4 @@ composite,
           if (token !== null) {
-            if (modifier === null) {
-              modifier = StdUriTemplate.getModifier(character, token, i);
+            if (operator === null) {
+              operator = StdUriTemplate.getOperator(character, token, i);
             } else if (maxCharBuffer !== null) {
@@ -188,20 +188,20 @@ if (character.match(/^\d$/)) {
 
-  private static addPrefix(mod: Modifier | null, result: string[]): void {
-    switch (mod) {
-      case Modifier.HASH:
+  private static addPrefix(op: Operator | null, result: string[]): void {
+    switch (op) {
+      case Operator.HASH:
         result.push('#');
         break;
-      case Modifier.DOT:
+      case Operator.DOT:
         result.push('.');
         break;
-      case Modifier.SLASH:
+      case Operator.SLASH:
         result.push('/');
         break;
-      case Modifier.SEMICOLON:
+      case Operator.SEMICOLON:
         result.push(';');
         break;
-      case Modifier.QUESTION_MARK:
+      case Operator.QUESTION_MARK:
         result.push('?');
         break;
-      case Modifier.AMP:
+      case Operator.AMP:
         result.push('&');
@@ -214,15 +214,15 @@ break;
 
-  private static addSeparator(mod: Modifier | null, result: string[]): void {
-    switch (mod) {
-      case Modifier.DOT:
+  private static addSeparator(op: Operator | null, result: string[]): void {
+    switch (op) {
+      case Operator.DOT:
         result.push('.');
         break;
-      case Modifier.SLASH:
+      case Operator.SLASH:
         result.push('/');
         break;
-      case Modifier.SEMICOLON:
+      case Operator.SEMICOLON:
         result.push(';');
         break;
-      case Modifier.QUESTION_MARK:
-      case Modifier.AMP:
+      case Operator.QUESTION_MARK:
+      case Operator.AMP:
         result.push('&');
@@ -236,14 +236,14 @@ break;
 
-  private static addValue(mod: Modifier | null, token: string, value: string, result: string[], maxChar: number): void {
-    switch (mod) {
-      case Modifier.PLUS:
-      case Modifier.HASH:
+  private static addValue(op: Operator | null, token: string, value: string, result: string[], maxChar: number): void {
+    switch (op) {
+      case Operator.PLUS:
+      case Operator.HASH:
         StdUriTemplate.addExpandedValue(value, result, maxChar, false);
         break;
-      case Modifier.QUESTION_MARK:
-      case Modifier.AMP:
+      case Operator.QUESTION_MARK:
+      case Operator.AMP:
         result.push(`${token}=`);
         StdUriTemplate.addExpandedValue(value, result, maxChar, true);
         break;
-      case Modifier.SEMICOLON:
+      case Operator.SEMICOLON:
         result.push(token);
@@ -255,5 +255,5 @@ if (value.length > 0) {
         break;
-      case Modifier.DOT:
-      case Modifier.SLASH:
-      case Modifier.NO_MOD:
+      case Operator.DOT:
+      case Operator.SLASH:
+      case Operator.NO_OP:
         StdUriTemplate.addExpandedValue(value, result, maxChar, true);
@@ -264,14 +264,14 @@ break;
 
-  private static addValueElement(mod: Modifier | null, token: string, value: string, result: string[], maxChar: number): void {
-    switch (mod) {
-      case Modifier.PLUS:
-      case Modifier.HASH:
+  private static addValueElement(op: Operator | null, token: string, value: string, result: string[], maxChar: number): void {
+    switch (op) {
+      case Operator.PLUS:
+      case Operator.HASH:
         StdUriTemplate.addExpandedValue(value, result, maxChar, false);
         break;
-      case Modifier.QUESTION_MARK:
-      case Modifier.AMP:
-      case Modifier.SEMICOLON:
-      case Modifier.DOT:
-      case Modifier.SLASH:
-      case Modifier.NO_MOD:
+      case Operator.QUESTION_MARK:
+      case Operator.AMP:
+      case Operator.SEMICOLON:
+      case Operator.DOT:
+      case Operator.SLASH:
+      case Operator.NO_OP:
         StdUriTemplate.addExpandedValue(value, result, maxChar, true);
@@ -382,3 +382,3 @@ break;
   private static expandToken(
-    modifier: Modifier | null,
+    operator: Operator | null,
     token: string,
@@ -409,5 +409,5 @@ composite: boolean,
     if (firstToken) {
-      StdUriTemplate.addPrefix(modifier, result);
+      StdUriTemplate.addPrefix(operator, result);
     } else {
-      StdUriTemplate.addSeparator(modifier, result);
+      StdUriTemplate.addSeparator(operator, result);
     }
@@ -417,9 +417,9 @@
       case SubstitutionType.STRING:
-        StdUriTemplate.addStringValue(modifier, token, value, result, maxChar);
+        StdUriTemplate.addStringValue(operator, token, value, result, maxChar);
         break;
       case SubstitutionType.LIST:
-        StdUriTemplate.addListValue(modifier, token, value, result, maxChar, composite);
+        StdUriTemplate.addListValue(operator, token, value, result, maxChar, composite);
         break;
       case SubstitutionType.MAP:
-        StdUriTemplate.addMapValue(modifier, token, value, result, maxChar, composite);
+        StdUriTemplate.addMapValue(operator, token, value, result, maxChar, composite);
         break;
@@ -431,8 +431,8 @@ }
 
-  private static addStringValue(modifier: Modifier | null, token: string, value: string, result: string[], maxChar: number): void {
-    StdUriTemplate.addValue(modifier, token, value, result, maxChar);
+  private static addStringValue(operator: Operator | null, token: string, value: string, result: string[], maxChar: number): void {
+    StdUriTemplate.addValue(operator, token, value, result, maxChar);
   }
 
   private static addListValue(
-    modifier: Modifier | null,
+    operator: Operator | null,
     token: string,
@@ -447,11 +447,11 @@ value: string[],
       if (first) {
-        StdUriTemplate.addValue(modifier, token, v, result, maxChar);
+        StdUriTemplate.addValue(operator, token, v, result, maxChar);
         first = false;
       } else {
         if (composite) {
-          StdUriTemplate.addSeparator(modifier, result);
-          StdUriTemplate.addValue(modifier, token, v, result, maxChar);
+          StdUriTemplate.addSeparator(operator, result);
+          StdUriTemplate.addValue(operator, token, v, result, maxChar);
         } else {
           result.push(',');
-          StdUriTemplate.addValueElement(modifier, token, v, result, maxChar);
+          StdUriTemplate.addValueElement(operator, token, v, result, maxChar);
         }
@@ -463,3 +463,3 @@ }
   private static addMapValue(
-    modifier: Modifier | null,
+    operator: Operator | null,
     token: string,
@@ -479,16 +479,16 @@ value: { [key: string]: string },
         if (!first) {
-          StdUriTemplate.addSeparator(modifier, result);
+          StdUriTemplate.addSeparator(operator, result);
         }
-        StdUriTemplate.addValueElement(modifier, token, key, result, maxChar);
+        StdUriTemplate.addValueElement(operator, token, key, result, maxChar);
         result.push('=');
       } else {
         if (first) {
-          StdUriTemplate.addValue(modifier, token, key, result, maxChar);
+          StdUriTemplate.addValue(operator, token, key, result, maxChar);
         } else {
           result.push(',');
-          StdUriTemplate.addValueElement(modifier, token, key, result, maxChar);
+          StdUriTemplate.addValueElement(operator, token, key, result, maxChar);
         }
         result.push(',');
       }
-      StdUriTemplate.addValueElement(modifier, token, v, result, maxChar);
+      StdUriTemplate.addValueElement(operator, token, v, result, maxChar);
       first = false;
@@ -495,0 +495,0 @@ }

New alerts

License Policy Violation

License

This package is not allowed per your license policy. Review the package's license to ensure compliance.

Found 1 instance in 1 package

Fixed alerts

License Policy Violation

License

This package is not allowed per your license policy. Review the package's license to ensure compliance.

Found 1 instance in 1 package

Worsened metrics

Total package byte prevSize

51550

decreased by-0.1%

Number of lines in readme file

250

decreased by-1.57%

No dependency changes