@outfoxx/sunday 2.0.0-beta.6 → 2.0.0-beta.7

package/README.md

@@ -89,3 +89,11 @@ values again. Custom transports must invoke the callback at the same boundary be
 
 Parameter failures throw `RequestValidationError` with the native validation error as `cause`.
 Event sources close on this error, and event stream iterators reject instead of reconnecting.
+
+## URI template variables
+
+`URLTemplate.complete` preserves the distinction between an empty string and a missing,
+`undefined`, or `null` value. For `/items{/id}`, `id: ''` produces `/items/`, while an
+undefined `id` produces `/items`. An empty collection is undefined; a list containing
+an empty string has a defined member. Per-call values override stored template parameters,
+including explicit null or undefined values that remove a stored value for that expansion.

package/build/url-template.d.ts

@@ -1,6 +1,9 @@
+/** An RFC 6570 URL template with reusable parameter defaults. */
 export declare class URLTemplate {
     template: string;
     parameters: Record<string, unknown>;
+    /** Creates a template whose stored parameters can be overridden for each expansion. */
     constructor(template: string, parameters?: Record<string, unknown>);
+    /** Expands base and relative templates, preserving empty values and omitting null or missing values. */
     complete(relativeTemplate: string, parameters: Record<string, unknown>): URL;
 }

package/build/url-template.js

@@ -11,14 +11,17 @@
 // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 // See the License for the specific language governing permissions and
 // limitations under the License.
-import { parse } from 'uri-template';
+import { expandExpression, parse } from 'uri-template';
+/** An RFC 6570 URL template with reusable parameter defaults. */
 export class URLTemplate {
     template;
     parameters;
+    /** Creates a template whose stored parameters can be overridden for each expansion. */
     constructor(template, parameters = {}) {
         this.template = template;
         this.parameters = parameters;
     }
+    /** Expands base and relative templates, preserving empty values and omitting null or missing values. */
     complete(relativeTemplate, parameters) {
         const allParameters = { ...this.parameters, ...parameters };
         const baseTempl = this.template.endsWith('/')
@@ -27,7 +30,32 @@ export class URLTemplate {
         const relTempl = relativeTemplate.startsWith('/') || !relativeTemplate.length
             ? relativeTemplate
             : `/${relativeTemplate}`;
-        return new URL(parse(baseTempl + relTempl).expand(allParameters));
+        const template = parse(baseTempl + relTempl);
+        const expanded = template.ast.parts
+            .map((part) => {
+            if (part.type === 'literal')
+                return part.value;
+            const value = expandExpression(part, allParameters);
+            // uri-template 2 drops the path prefix when defined variables expand to an empty string.
+            if (part.operator === '/' &&
+                value === '' &&
+                part.variables.some((variable) => isDefined(allParameters[variable.name]))) {
+                return '/';
+            }
+            return value;
+        })
+            .join('');
+        return new URL(expanded);
     }
 }
+// RFC 6570 treats empty collections as undefined, but an empty string is defined.
+function isDefined(value) {
+    if (value == null)
+        return false;
+    if (typeof value !== 'object')
+        return true;
+    if (Array.isArray(value))
+        return value.length > 0;
+    return Object.values(value).some((entry) => entry != null);
+}
 //# sourceMappingURL=url-template.js.map

package/build/url-template.js.map

@@ -1 +1 @@
-{"version":3,"file":"url-template.js","sourceRoot":"","sources":["../src/url-template.ts"],"names":[],"mappings":"AAAA,8BAA8B;AAC9B,EAAE;AACF,kEAAkE;AAClE,mEAAmE;AACnE,0CAA0C;AAC1C,EAAE;AACF,gDAAgD;AAChD,EAAE;AACF,sEAAsE;AACtE,oEAAoE;AACpE,2EAA2E;AAC3E,sEAAsE;AACtE,iCAAiC;AAEjC,OAAO,EAAE,KAAK,EAAE,MAAM,cAAc,CAAC;AAErC,MAAM,OAAO,WAAW;IAEb;IACA;IAFT,YACS,QAAgB,EAChB,aAAsC,EAAE;QADxC,aAAQ,GAAR,QAAQ,CAAQ;QAChB,eAAU,GAAV,UAAU,CAA8B;IAC9C,CAAC;IAEJ,QAAQ,CAAC,gBAAwB,EAAE,UAAmC;QACpE,MAAM,aAAa,GAAG,EAAE,GAAG,IAAI,CAAC,UAAU,EAAE,GAAG,UAAU,EAAE,CAAC;QAC5D,MAAM,SAAS,GAAG,IAAI,CAAC,QAAQ,CAAC,QAAQ,CAAC,GAAG,CAAC;YAC3C,CAAC,CAAC,IAAI,CAAC,QAAQ,CAAC,KAAK,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC;YAC5B,CAAC,CAAC,IAAI,CAAC,QAAQ,CAAC;QAClB,MAAM,QAAQ,GACZ,gBAAgB,CAAC,UAAU,CAAC,GAAG,CAAC,IAAI,CAAC,gBAAgB,CAAC,MAAM;YAC1D,CAAC,CAAC,gBAAgB;YAClB,CAAC,CAAC,IAAI,gBAAgB,EAAE,CAAC;QAC7B,OAAO,IAAI,GAAG,CAAC,KAAK,CAAC,SAAS,GAAG,QAAQ,CAAC,CAAC,MAAM,CAAC,aAAa,CAAC,CAAC,CAAC;IACpE,CAAC;CACF"}
+{"version":3,"file":"url-template.js","sourceRoot":"","sources":["../src/url-template.ts"],"names":[],"mappings":"AAAA,8BAA8B;AAC9B,EAAE;AACF,kEAAkE;AAClE,mEAAmE;AACnE,0CAA0C;AAC1C,EAAE;AACF,gDAAgD;AAChD,EAAE;AACF,sEAAsE;AACtE,oEAAoE;AACpE,2EAA2E;AAC3E,sEAAsE;AACtE,iCAAiC;AAEjC,OAAO,EAAE,gBAAgB,EAAE,KAAK,EAAE,MAAM,cAAc,CAAC;AAEvD,iEAAiE;AACjE,MAAM,OAAO,WAAW;IAGb;IACA;IAHT,uFAAuF;IACvF,YACS,QAAgB,EAChB,aAAsC,EAAE;QADxC,aAAQ,GAAR,QAAQ,CAAQ;QAChB,eAAU,GAAV,UAAU,CAA8B;IAC9C,CAAC;IAEJ,wGAAwG;IACxG,QAAQ,CAAC,gBAAwB,EAAE,UAAmC;QACpE,MAAM,aAAa,GAAG,EAAE,GAAG,IAAI,CAAC,UAAU,EAAE,GAAG,UAAU,EAAE,CAAC;QAC5D,MAAM,SAAS,GAAG,IAAI,CAAC,QAAQ,CAAC,QAAQ,CAAC,GAAG,CAAC;YAC3C,CAAC,CAAC,IAAI,CAAC,QAAQ,CAAC,KAAK,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC;YAC5B,CAAC,CAAC,IAAI,CAAC,QAAQ,CAAC;QAClB,MAAM,QAAQ,GACZ,gBAAgB,CAAC,UAAU,CAAC,GAAG,CAAC,IAAI,CAAC,gBAAgB,CAAC,MAAM;YAC1D,CAAC,CAAC,gBAAgB;YAClB,CAAC,CAAC,IAAI,gBAAgB,EAAE,CAAC;QAC7B,MAAM,QAAQ,GAAG,KAAK,CAAC,SAAS,GAAG,QAAQ,CAAC,CAAC;QAC7C,MAAM,QAAQ,GAAG,QAAQ,CAAC,GAAG,CAAC,KAAK;aAChC,GAAG,CAAC,CAAC,IAAI,EAAE,EAAE;YACZ,IAAI,IAAI,CAAC,IAAI,KAAK,SAAS;gBAAE,OAAO,IAAI,CAAC,KAAK,CAAC;YAC/C,MAAM,KAAK,GAAG,gBAAgB,CAAC,IAAI,EAAE,aAAa,CAAC,CAAC;YACpD,yFAAyF;YACzF,IACE,IAAI,CAAC,QAAQ,KAAK,GAAG;gBACrB,KAAK,KAAK,EAAE;gBACZ,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC,CAAC,QAAQ,EAAE,EAAE,CAC/B,SAAS,CAAC,aAAa,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAC,CACxC,EACD,CAAC;gBACD,OAAO,GAAG,CAAC;YACb,CAAC;YACD,OAAO,KAAK,CAAC;QACf,CAAC,CAAC;aACD,IAAI,CAAC,EAAE,CAAC,CAAC;QACZ,OAAO,IAAI,GAAG,CAAC,QAAQ,CAAC,CAAC;IAC3B,CAAC;CACF;AAED,kFAAkF;AAClF,SAAS,SAAS,CAAC,KAAc;IAC/B,IAAI,KAAK,IAAI,IAAI;QAAE,OAAO,KAAK,CAAC;IAChC,IAAI,OAAO,KAAK,KAAK,QAAQ;QAAE,OAAO,IAAI,CAAC;IAC3C,IAAI,KAAK,CAAC,OAAO,CAAC,KAAK,CAAC;QAAE,OAAO,KAAK,CAAC,MAAM,GAAG,CAAC,CAAC;IAClD,OAAO,MAAM,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC,IAAI,CAAC,CAAC,KAAK,EAAE,EAAE,CAAC,KAAK,IAAI,IAAI,CAAC,CAAC;AAC7D,CAAC"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@outfoxx/sunday",
-  "version": "v2.0.0-beta.6",
+  "version": "v2.0.0-beta.7",
   "description": "Sunday 🙏 The framework of REST for TypeScript/JavaScript",
   "packageManager": "bun@1.3.10",
   "type": "module",