@es-joy/jsoe 0.26.0 → 0.27.0

package/src/fundamentalTypes/arrayType.js

@@ -709,7 +709,8 @@ const arrayType = {
   editUI ({
     typeNamespace, buildTypeChoices, format, // resultType,
     formats, types, specificSchemaObject, schemaFallingBack, schemaContent,
-    type, forcedState, topRoot, value: objectValue, bringIntoFocus = true
+    type, forcedState, topRoot, value: objectValue, hasValue,
+    bringIntoFocus = true
   }) {
     const {sparse} = this;
     // eslint-disable-next-line consistent-this -- Clearer
@@ -1627,9 +1628,27 @@ const arrayType = {
           specificSchemaObject
         )?.element;
       }
-      return /** @type {import('zodexy').SzObject} */ (
+      const objectSchema = /** @type {import('zodexy').SzObject} */ (
         specificSchemaObject
-      )?.properties?.[/** @type {string} */ (propName)];
+      );
+      const schemaType = specificSchemaObject?.type;
+      const propSchema = objectSchema?.properties?.[/** @type {string} */ (
+        propName
+      )];
+      if (
+        !propSchema &&
+        (schemaType === 'properties' ||
+          (schemaType === 'object' && !objectSchema.catchall))
+      ) {
+        // A key outside the declared shape of a `z.properties()` (which keeps
+        //   it) or a `catchall`-less `z.object()` (which strips it on parse but
+        //   still shows it while editing): offer the unconstrained type choice
+        //   rather than an unschema'd control, as a `looseRecord`'s
+        //   non-conforming entry gets. An `object` `catchall` takes precedence
+        //   (handled where the per-property schema is chosen elsewhere).
+        return /** @type {import('zodexy').SzType} */ ({type: 'unknown'});
+      }
+      return propSchema;
     };
 
     /**
@@ -2611,10 +2630,16 @@ const arrayType = {
           }
         }, /** @type {import('jamilih').JamilihChildren} */ ([
           [specificSchemaObject ? 'span' : 'b', {
-            title: schemaLabel(specificSchemaObject) ?? (DOM.initialCaps(
-              /** @type {import('../types.js').AvailableType} */
-              (itemType)
-            ).replace(/s$/u, ''))
+            title: schemaLabel(specificSchemaObject) ?? (
+              // `z.properties()` renders through the `object` UI; without a
+              //   `meta` label of its own, name it "Properties" rather than an
+              //   indistinguishable "Object".
+              specificSchemaObject?.type === 'properties'
+                ? 'Properties'
+                : DOM.initialCaps(
+                  /** @type {import('../types.js').AvailableType} */
+                  (itemType)
+                ).replace(/s$/u, ''))
           }, [
             specificSchemaObject
               ? '—'
@@ -2664,7 +2689,7 @@ const arrayType = {
       );
     topRoot ||= div;
 
-    if (!objectValue && specificSchemaObject && tupleMode) {
+    if (!hasValue && specificSchemaObject && tupleMode) {
       // See comment referencing `arrayType.js` in `typeChoices.js`
       if (!schemaFallingBack) {
         const specificSchemaObj = /** @type {import('zodexy').SzTuple} */ (
@@ -2676,7 +2701,7 @@ const arrayType = {
           }
         }
       }
-    } else if (!objectValue && specificSchemaObject) {
+    } else if (!hasValue && specificSchemaObject) {
       switch (type) {
       case 'object': {
         // See comment referencing `arrayType.js` in `typeChoices.js`

package/src/fundamentalTypes/regexpType.js

@@ -106,7 +106,15 @@ const regexpType = {
         'Source ',
         ['input', {
           name: `${typeNamespace}-regexp`, type: 'text',
-          value: value.source
+          value: value.source,
+          $on: {
+            input () {
+              types.validate({type: 'regexp', root});
+            },
+            change () {
+              types.validate({type: 'regexp', root});
+            }
+          }
         }]
       ]],
       ['br'],

package/src/fundamentalTypes/stringType.js

@@ -133,6 +133,11 @@ const stringType = {
             return `Value doesn't match credit card pattern.`;
           }
           break;
+        case 'iban':
+          if (!regexes.iban.test(value)) {
+            return `Value doesn't match iban pattern.`;
+          }
+          break;
         case 'ip':
           switch ('version' in stringSchemaObject &&
               stringSchemaObject.version) {

package/src/typeChoices.js

@@ -166,7 +166,9 @@ function deriveXorBranchLabel (schemaObj, optText, idx) {
       return String(values[0]);
     }
   }
-  if (schemaObj && schemaObj.type === 'object') {
+  if (schemaObj &&
+    (schemaObj.type === 'object' || schemaObj.type === 'properties')
+  ) {
     const {properties} = /** @type {import('zodexy').SzObject} */ (schemaObj);
     const keys = properties && typeof properties === 'object'
       ? Object.keys(properties)
@@ -471,7 +473,12 @@ export const buildTypeChoices = ({
           this.value = type;
         }
         this.$setStyles();
-        this.$addAndValidateEditUI({baseValue, bringIntoFocus, avoidReport});
+        this.$addAndValidateEditUI({
+          baseValue,
+          bringIntoFocus,
+          schemaObject: specificSchema,
+          avoidReport
+        });
       },
       /**
        * @this {TypeChoicesElementAPI}
@@ -551,7 +558,7 @@ export const buildTypeChoices = ({
           typeNamespace,
           type: /** @type {import('./types.js').AvailableArbitraryType} */ (type),
           bringIntoFocus,
-          hasValue: type === 'arrayNonindexKeys' && baseValue,
+          hasValue: baseValue !== undefined,
           value: baseValue,
           buildTypeChoices,
           format,
@@ -588,7 +595,7 @@ export const buildTypeChoices = ({
         });
         topRoot = this.$getTopRoot(); // May be existing now
         // Needed; Array/object ref somewhere could now be valid or invalid
-        types.validateAllReferences({topRoot});
+        types.validateAllReferences({topRoot, avoidReport});
       },
 
       /**
@@ -719,10 +726,7 @@ export const buildTypeChoices = ({
           value = {};
         }
         try {
-          const {
-            rootUI: rootEditUI,
-            specificSchemas
-          } = await formats.getControlsForFormatAndValue(
+          const builtState = await formats.getControlsForFormatAndValue(
             types,
             format,
             value,
@@ -735,6 +739,10 @@ export const buildTypeChoices = ({
               types
             }
           );
+          const {
+            rootUI: rootEditUI,
+            specificSchemas
+          } = builtState;
           const type =
             Types.getTypeForRoot(/** @type {HTMLDivElement} */ (
               rootEditUI
@@ -749,6 +757,7 @@ export const buildTypeChoices = ({
             // We do actually want the first one
             specificSchema: specificSchemas?.[0]
           });
+          await builtState.whenBuilt;
         } catch (err) {
           /* istanbul ignore next -- At least some errors handled earlier */
           dialogs.alert({

package/src/types.js

@@ -202,7 +202,8 @@ export const getPropertyValueFromLegend = (legend) => {
 
 /**
  * @typedef {(cfg: {
- *   topRoot: RootElement
+ *   topRoot: RootElement,
+ *   avoidReport?: boolean
  * }) => void} ValidateAllReferences
  */
 
@@ -359,6 +360,7 @@ export const getPropertyValueFromLegend = (legend) => {
  *   buildTypeChoices?: import('./typeChoices.js').BuildTypeChoices,
  *   schemaContent?: import('./formats/schema.js').ZodexSchema
  *   replaced?: any
+ *   hasValue?: boolean
  * }) => JamilihArray} viewUI
  * @property {(info: {
  *   value?: StructuredCloneValue,
@@ -374,7 +376,8 @@ export const getPropertyValueFromLegend = (legend) => {
  *   topRoot?: HTMLDivElement
  *   schemaContent?: import('./formats/schema.js').ZodexSchema,
  *   specificSchemaObject?: import('./formats/schema.js').ZodexSchema,
- *   schemaFallingBack?: boolean
+ *   schemaFallingBack?: boolean,
+ *   hasValue?: boolean
  * }) => JamilihArray} editUI
  * @property {(info: {root: HTMLDivElement}) =>
  *   HTMLInputElement|HTMLTextAreaElement|HTMLSelectElement|
@@ -391,7 +394,8 @@ export const getPropertyValueFromLegend = (legend) => {
  * }} [validate] Message will be used if validity is false.
  * @property {(info: {
  *   topRoot: HTMLDivElement,
- *   types: Types
+ *   types: Types,
+ *   avoidReport?: boolean
  * }) => void} [validateAll] For
  *   validation of array and object references only.
  * @property {{
@@ -717,6 +721,13 @@ class Types {
     // `record`/`tuple` are not shown as their own pull-down entries; they render
     //   as `Object`/`Array` (their schema, incl. child descriptions, informs the
     //   layout — see `arrayType.js`).
+    // `z.properties()` likewise renders through the `object` type/UI; when the
+    //   schema supplies no label of its own, name it "Properties" so it is not
+    //   shown as an indistinguishable "Object".
+    if (type === 'object' && schemaContent?.type === 'properties') {
+      optInfo[0] = 'Properties';
+    }
+
     const schemaContentLabel = resolveSchemaMeta(schemaContent).label;
     if (schemaContentLabel) {
       optInfo[0] = `${optInfo[0]} (${schemaContentLabel})`;
@@ -766,7 +777,7 @@ class Types {
         format, schemaContent,
         resultType, topRoot, bringIntoFocus, value,
         replaced,
-        specificSchemaObject, schemaFallingBack,
+        specificSchemaObject, schemaFallingBack, hasValue,
         types: this
       }
       : {
@@ -774,7 +785,7 @@ class Types {
         format, schemaContent,
         resultType, topRoot, bringIntoFocus,
         replaced,
-        specificSchemaObject, schemaFallingBack,
+        specificSchemaObject, schemaFallingBack, hasValue,
         types: this
       };
     const root = /** @type {HTMLDivElement} */ (jml(
@@ -796,7 +807,7 @@ class Types {
   }
 
   /** @type {ValidateAllReferences} */
-  validateAllReferences ({topRoot}) {
+  validateAllReferences ({topRoot, avoidReport}) {
     /* istanbul ignore if -- Unreachable? */
     if (!topRoot) {
       console.log('No references present');
@@ -808,7 +819,7 @@ class Types {
     Object.values(this.availableTypes).forEach((typeObj) => {
       const typeObject = /** @type {TypeObject} */ (typeObj);
       if (typeObject.validateAll) {
-        typeObject.validateAll({topRoot, types: this});
+        typeObject.validateAll({topRoot, types: this, avoidReport});
       }
     });
 
@@ -858,7 +869,7 @@ class Types {
         'message' in error
         ? error.message
         : undefined;
-      if (errorMessage !== 'Not yet instantiated') {
+      if (errorMessage !== 'Not yet instantiated' && typeValidation.valid) {
         return false;
       }
       valueReady = false;

package/vendor/typeson-registry/dist/index.js

@@ -1051,6 +1051,26 @@ const filelist = {
     }
 };
 
+/* globals IDBKeyRange -- Polyfill needed */
+
+
+/**
+ * @type {import('typeson').TypeSpecSet}
+ */
+const idbkeyrange = {
+    idbkeyrange: {
+        test (x) {
+            return toStringTag(x) === 'IDBKeyRange';
+        },
+        replace ({lower, upper, lowerOpen, upperOpen}) {
+            return {lower, upper, lowerOpen, upperOpen};
+        },
+        revive ({lower, upper, lowerOpen, upperOpen}) {
+            return IDBKeyRange.bound(lower, upper, lowerOpen, upperOpen);
+        }
+    }
+};
+
 /* globals document, OffscreenCanvas, createImageBitmap -- Polyfills */
 // `ImageBitmap` is browser / DOM specific. It also can only work
 //  same-domain (or CORS)
@@ -1432,10 +1452,18 @@ const promise = {
 const quotaexceedederror = {
     quotaexceedederror: {
         test (x) { return toStringTag(x) === 'QuotaExceededError'; },
-        replace ({message, quota, requested}) {
-            return {message, quota, requested};
+        replace ({
+            message, quota, requested,
+            cause, stack, fileName, lineNumber, columnNumber
+        }) {
+            return {
+                message, quota, requested,
+                cause, stack, fileName, lineNumber, columnNumber
+            };
         },
-        revive ({message, quota, requested}) {
+        revive (obj) {
+            const {message, quota, requested} = obj;
+
             /** @type {{quota?: number, requested?: number}} */
             const options = {};
             if (quota !== null && quota !== undefined) {
@@ -1444,7 +1472,26 @@ const quotaexceedederror = {
             if (requested !== null && requested !== undefined) {
                 options.requested = requested;
             }
-            return new QuotaExceededError(message, options);
+            const e = /**
+                       * @type {{
+                       *   name: string,
+                       *   cause: Error,
+                       *   stack: string,
+                       *   fileName?: string,
+                       *   lineNumber?: import('typeson').Integer,
+                       *   columnNumber?: import('typeson').Integer
+                       * }}
+                       */ (
+                    new QuotaExceededError(message, options)
+                );
+
+            e.cause = obj.cause;
+            e.stack = obj.stack;
+            e.fileName = obj.fileName;
+            e.lineNumber = obj.lineNumber;
+            e.columnNumber = obj.columnNumber;
+
+            return e;
         }
     }
 };
@@ -1824,15 +1871,41 @@ const webtransporterror = {
         test (x) { return toStringTag(x) === 'WebTransportError'; },
         // Note that we can't support the `source` property (defaults
         //   to `stream` instead of `session`)
-        replace ({message, streamErrorCode}) {
-            return {message, streamErrorCode};
+        replace ({
+            message, streamErrorCode,
+            cause, stack, fileName, lineNumber, columnNumber
+        }) {
+            return {
+                message, streamErrorCode,
+                cause, stack, fileName, lineNumber, columnNumber
+            };
         },
-        revive ({message, streamErrorCode}) {
+        revive (obj) {
+            const {message, streamErrorCode} = obj;
             // TS lib still models the older two-argument
             //   `(message, options)` form; browsers implement a single
             //   `init` object (which also carries `message`).
-            // @ts-expect-error - More recent API
-            return new WebTransportError({message, streamErrorCode});
+            const e = /**
+                       * @type {{
+                       *   name: string,
+                       *   cause: Error,
+                       *   stack: string,
+                       *   fileName?: string,
+                       *   lineNumber?: import('typeson').Integer,
+                       *   columnNumber?: import('typeson').Integer
+                       * }}
+                       */ (
+                    // @ts-expect-error - More recent API
+                    new WebTransportError({message, streamErrorCode})
+                );
+
+            e.cause = obj.cause;
+            e.stack = obj.stack;
+            e.fileName = obj.fileName;
+            e.lineNumber = obj.lineNumber;
+            e.columnNumber = obj.columnNumber;
+
+            return e;
         }
     }
 };
@@ -2256,5 +2329,5 @@ const universal = [
     //   built-in into ecmasript standard.
 ];
 
-export { c as JSON_TYPES, Typeson, TypesonPromise, Undefined, arrayNonindexKeys, arraybuffer, audiodata, bigint, bigintObject, blob, expObj$1 as builtin, cloneable, cryptokey, dataview, date, domexception, dommatrix, dompoint, domquad, domrect, encodedaudiochunk, encodedvideochunk, error, errors, escapeKeyPathComponent, file, filelist, getByKeyPath, getJSONType, hasConstructorOf, imagebitmap, imagedata, infinity, intlTypes, isObject, isPlainObject, isThenable, isUserObject, map, nan, negativeInfinity, negativeZero, nonbuiltinIgnore, postmessage, primitiveObjects, promise, quotaexceedederror, regexp, resurrectable, set, setAtKeyPath, socketio, sparseUndefined, specialNumbers, expObj as structuredCloning, structuredCloningForStorage, structuredCloningThrowing, symbol, toStringTag, typedArrays, typedArraysSocketIO as typedArraysSocketio, undef$1 as undef, undef as undefPreset, unescapeKeyPathComponent, universal, userObject, videoframe, webtransporterror };
+export { c as JSON_TYPES, Typeson, TypesonPromise, Undefined, arrayNonindexKeys, arraybuffer, audiodata, bigint, bigintObject, blob, expObj$1 as builtin, cloneable, cryptokey, dataview, date, domexception, dommatrix, dompoint, domquad, domrect, encodedaudiochunk, encodedvideochunk, error, errors, escapeKeyPathComponent, file, filelist, getByKeyPath, getJSONType, hasConstructorOf, idbkeyrange, imagebitmap, imagedata, infinity, intlTypes, isObject, isPlainObject, isThenable, isUserObject, map, nan, negativeInfinity, negativeZero, nonbuiltinIgnore, postmessage, primitiveObjects, promise, quotaexceedederror, regexp, resurrectable, set, setAtKeyPath, socketio, sparseUndefined, specialNumbers, expObj as structuredCloning, structuredCloningForStorage, structuredCloningThrowing, symbol, toStringTag, typedArrays, typedArraysSocketIO as typedArraysSocketio, undef$1 as undef, undef as undefPreset, unescapeKeyPathComponent, universal, userObject, videoframe, webtransporterror };
 //# sourceMappingURL=index.js.map

package/vendor/zod/classic/checks.d.ts

@@ -1 +1 @@
-export { _lt as lt, _lte as lte, _gt as gt, _gte as gte, _positive as positive, _negative as negative, _nonpositive as nonpositive, _nonnegative as nonnegative, _multipleOf as multipleOf, _maxSize as maxSize, _minSize as minSize, _size as size, _maxLength as maxLength, _minLength as minLength, _length as length, _regex as regex, _lowercase as lowercase, _uppercase as uppercase, _includes as includes, _startsWith as startsWith, _endsWith as endsWith, _property as property, _properties as properties, _mime as mime, _overwrite as overwrite, _normalize as normalize, _trim as trim, _toLowerCase as toLowerCase, _toUpperCase as toUpperCase, _slugify as slugify, type $RefinementCtx as RefinementCtx, } from "../core/index.js";
+export { _lt as lt, _lte as lte, _gt as gt, _gte as gte, _positive as positive, _negative as negative, _nonpositive as nonpositive, _nonnegative as nonnegative, _multipleOf as multipleOf, _maxSize as maxSize, _minSize as minSize, _size as size, _maxLength as maxLength, _minLength as minLength, _length as length, _regex as regex, _lowercase as lowercase, _uppercase as uppercase, _includes as includes, _startsWith as startsWith, _endsWith as endsWith, _property as property, _mime as mime, _overwrite as overwrite, _normalize as normalize, _trim as trim, _toLowerCase as toLowerCase, _toUpperCase as toUpperCase, _slugify as slugify, type $RefinementCtx as RefinementCtx, } from "../core/index.js";

package/vendor/zod/classic/checks.js

@@ -1 +1 @@
-export { _lt as lt, _lte as lte, _gt as gt, _gte as gte, _positive as positive, _negative as negative, _nonpositive as nonpositive, _nonnegative as nonnegative, _multipleOf as multipleOf, _maxSize as maxSize, _minSize as minSize, _size as size, _maxLength as maxLength, _minLength as minLength, _length as length, _regex as regex, _lowercase as lowercase, _uppercase as uppercase, _includes as includes, _startsWith as startsWith, _endsWith as endsWith, _property as property, _properties as properties, _mime as mime, _overwrite as overwrite, _normalize as normalize, _trim as trim, _toLowerCase as toLowerCase, _toUpperCase as toUpperCase, _slugify as slugify, } from "../core/index.js";
+export { _lt as lt, _lte as lte, _gt as gt, _gte as gte, _positive as positive, _negative as negative, _nonpositive as nonpositive, _nonnegative as nonnegative, _multipleOf as multipleOf, _maxSize as maxSize, _minSize as minSize, _size as size, _maxLength as maxLength, _minLength as minLength, _length as length, _regex as regex, _lowercase as lowercase, _uppercase as uppercase, _includes as includes, _startsWith as startsWith, _endsWith as endsWith, _property as property, _mime as mime, _overwrite as overwrite, _normalize as normalize, _trim as trim, _toLowerCase as toLowerCase, _toUpperCase as toUpperCase, _slugify as slugify, } from "../core/index.js";

package/vendor/zod/classic/external.d.ts

@@ -7,7 +7,7 @@ export * from "./compat.js";
 export type { infer } from "../core/index.js";
 export type { JSONType } from "../core/util.js";
 export type { CompileOptions } from "../core/index.js";
-export { globalRegistry, type GlobalMeta, registry, config, memoizer, $output, $input, $brand, clone, regexes, treeifyError, prettifyError, formatError, flattenError, TimePrecision, util, NEVER, toZod, compile, ZodCompileAsyncError, ZodCompileUnsupportedError, getDiscriminatedOption, } from "../core/index.js";
+export { globalRegistry, type GlobalMeta, registry, config, memoizer, $output, $input, $brand, clone, regexes, treeifyError, prettifyError, formatError, flattenError, TimePrecision, util, NEVER, INVALID, toZod, compile, withParser, ZodCompileAsyncError, ZodCompileUnsupportedError, getDiscriminatedOption, } from "../core/index.js";
 export { toJSONSchema } from "../core/json-schema-processors.js";
 export { fromJSONSchema } from "./from-json-schema.js";
 export { deepPartial } from "./deep-partial.js";

package/vendor/zod/classic/external.js

@@ -4,7 +4,7 @@ export * from "./checks.js";
 export * from "./errors.js";
 export * from "./parse.js";
 export * from "./compat.js";
-export { globalRegistry, registry, config, memoizer, $output, $input, $brand, clone, regexes, treeifyError, prettifyError, formatError, flattenError, TimePrecision, util, NEVER, toZod, compile, ZodCompileAsyncError, ZodCompileUnsupportedError, getDiscriminatedOption, } from "../core/index.js";
+export { globalRegistry, registry, config, memoizer, $output, $input, $brand, clone, regexes, treeifyError, prettifyError, formatError, flattenError, TimePrecision, util, NEVER, INVALID, toZod, compile, withParser, ZodCompileAsyncError, ZodCompileUnsupportedError, getDiscriminatedOption, } from "../core/index.js";
 export { toJSONSchema } from "../core/json-schema-processors.js";
 export { fromJSONSchema } from "./from-json-schema.js";
 export { deepPartial } from "./deep-partial.js";