@es-joy/jsoe 0.20.0 → 0.20.2

package/CHANGES.md

@@ -1,5 +1,15 @@
 # CHANGES TO `@es-joy/jsoe`
 
+## 0.20.2
+
+- fix: setting of pull-downs with schemas
+
+## 0.20.1
+
+- fix: allow detection of matching schema which are copies and not references
+- fix: should pass original schema to editUI for `schemaContent`
+- fix: refer to original JSON
+
 ## 0.20.0
 
 - feat: make `getTypesForSchema` public

package/dist/formats/schema.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"schema.d.ts","sourceRoot":"","sources":["../../src/formats/schema.js"],"names":[],"mappings":"AAmMA;;;;GAIG;AACH,gDAJW,WAAW,gBACX,WAAW,GACT,GAAG,CAAC,WAAW,CAAC,CAgX5B;;0BA3fY,OAAO,OAAO,EAAE,MAAM;2BAGtB,OAAO,qBAAqB,EAAE,YAAY;;;;oBAnD1C,CAAC,IADD,CAAC,CAAC,MAAM,CAAC,CAAC;iCAMV,OAAO,CAChB,IAAI,CAAC,OAAO,OAAO,EAAE,MAAM,EAAE,MAAM,CAAC,CACrC;AAsiBH,6CAA6C;AAC7C,sBADW,OAAO,eAAe,EAAE,MAAM,CA2MvC"}
+{"version":3,"file":"schema.d.ts","sourceRoot":"","sources":["../../src/formats/schema.js"],"names":[],"mappings":"AAmMA;;;;GAIG;AACH,gDAJW,WAAW,gBACX,WAAW,GACT,GAAG,CAAC,WAAW,CAAC,CAiX5B;;0BA5fY,OAAO,OAAO,EAAE,MAAM;2BAGtB,OAAO,qBAAqB,EAAE,YAAY;;;;oBAnD1C,CAAC,IADD,CAAC,CAAC,MAAM,CAAC,CAAC;iCAMV,OAAO,CAChB,IAAI,CAAC,OAAO,OAAO,EAAE,MAAM,EAAE,MAAM,CAAC,CACrC;AAuiBH,6CAA6C;AAC7C,sBADW,OAAO,eAAe,EAAE,MAAM,CA2MvC"}

package/dist/fundamentalTypes/arrayType.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"arrayType.d.ts","sourceRoot":"","sources":["../../src/fundamentalTypes/arrayType.js"],"names":[],"mappings":";sBAaa,MAAM;mDAKN,KAAK,GAAC,OAAO;oCAGb,MAAM,gBAAgB,EAAE;+BAGxB,MAAM,CAAC,iBAAiB,GAAG;IACvC,SAAa,EAAE,OAAO,mBAAmB,EAAE,QAAQ,CAAA;CAChD,CAAC,EAAE;6BAGM,MAAM,IAAI;sCAIV,gBAAgB,EAAE;qCAKlB,IAAI;4BAGJ,MAAM,cAAc,GAAG;IACnC,sBAA0B,EAAE,qBAAqB,CAAC;IAClD,kBAAsB,EAAE,iBAAiB,CAAC;IAC1C,iBAAqB,EAAE,gBAAgB,CAAC;IACxC,iBAAqB,EAAE,gBAAgB,CAAA;CACpC;uBAGS,MAAM,OAAO,CAAC,IAAI,CAAC;2BAKrB;IAAC,WAAW,CAAC,EAAE,IAAI,CAAA;CAAC,KAClB,IAAI;+BAIJ,MAAM,gBAAgB,GAAC,SAAS;uBAIhC,GAAG;AAmBhB;;GAEG;AACH,yBAFU,OAAO,aAAa,EAAE,UAAU,GAAG;IAAC,MAAM,CAAC,EAAE,OAAO,GAAC,SAAS,CAAA;CAAC,CA+1EvE"}
+{"version":3,"file":"arrayType.d.ts","sourceRoot":"","sources":["../../src/fundamentalTypes/arrayType.js"],"names":[],"mappings":";sBAaa,MAAM;mDAKN,KAAK,GAAC,OAAO;oCAGb,MAAM,gBAAgB,EAAE;+BAGxB,MAAM,CAAC,iBAAiB,GAAG;IACvC,SAAa,EAAE,OAAO,mBAAmB,EAAE,QAAQ,CAAA;CAChD,CAAC,EAAE;6BAGM,MAAM,IAAI;sCAIV,gBAAgB,EAAE;qCAKlB,IAAI;4BAGJ,MAAM,cAAc,GAAG;IACnC,sBAA0B,EAAE,qBAAqB,CAAC;IAClD,kBAAsB,EAAE,iBAAiB,CAAC;IAC1C,iBAAqB,EAAE,gBAAgB,CAAC;IACxC,iBAAqB,EAAE,gBAAgB,CAAA;CACpC;uBAGS,MAAM,OAAO,CAAC,IAAI,CAAC;2BAKrB;IAAC,WAAW,CAAC,EAAE,IAAI,CAAA;CAAC,KAClB,IAAI;+BAIJ,MAAM,gBAAgB,GAAC,SAAS;uBAIhC,GAAG;AAmBhB;;GAEG;AACH,yBAFU,OAAO,aAAa,EAAE,UAAU,GAAG;IAAC,MAAM,CAAC,EAAE,OAAO,GAAC,SAAS,CAAA;CAAC,CAm2EvE"}

package/dist/index.js

@@ -2634,7 +2634,8 @@ dialogs.setLocale();
  *   type: string,
  *   baseValue?: import('./formats.js').StructuredCloneValue,
  *   bringIntoFocus?: boolean,
- *   avoidReport?: boolean
+ *   avoidReport?: boolean,
+ *   specificSchema?: import('zodex').SzType
  * }) => void} SetType
  */
 
@@ -2783,8 +2784,22 @@ const buildTypeChoices = ({
     $custom: {
       $getValue,
       /** @type {SetType} */
-      $setType ({type, baseValue, bringIntoFocus, avoidReport}) {
-        this.value = type;
+      $setType ({
+        type, baseValue, bringIntoFocus, avoidReport, specificSchema
+      }) {
+        if (schemaObjs && specificSchema) {
+          const idx = schemaObjs.map((obj) => {
+            return JSON.stringify(obj);
+          }).indexOf(JSON.stringify(specificSchema));
+          if (idx === -1) {
+            console.log('schemaObjs', schemaObjs, specificSchema);
+            this.value = type;
+          } else {
+            this.selectedIndex = idx + 1;
+          }
+        } else {
+          this.value = type;
+        }
         this.$setStyles();
         this.$addAndValidateEditUI({baseValue, bringIntoFocus, avoidReport});
       },
@@ -2796,7 +2811,9 @@ const buildTypeChoices = ({
        */
       $setTypeNoEditUI ({type, specificSchema}) {
         if (schemaObjs && specificSchema) {
-          const idx = schemaObjs.indexOf(specificSchema);
+          const idx = schemaObjs.map((obj) => {
+            return JSON.stringify(obj);
+          }).indexOf(JSON.stringify(specificSchema));
           this.selectedIndex = idx + 1;
         } else {
           this.value = type;
@@ -3377,7 +3394,7 @@ const encapsulateObserver = (stateObj) => {
         buildTypeChoices,
         format,
         specificSchemaObject: schema,
-        schemaContent: schema ?? schemaContent,
+        schemaContent,
         value: newValue,
         hasValue: true,
         // Not currently in use but may be convenient for a
@@ -9045,6 +9062,7 @@ function getTypesForSchema (schemaObject, originalJSON) {
     ]);
   default: {
     if ('$ref' in schemaObject) {
+      // console.log('originalJSON', originalJSON, schemaObject.$ref);
       const refObj = resolveJSONPointer({
         obj: originalJSON,
         path: /** @type {import('zodex').SzRef} */ (schemaObject).$ref
@@ -9135,7 +9153,7 @@ const schema = {
     }
     const schemaObjects = [...getTypesForSchema(
       /** @type {import('zodex').SzType} */ (currentSchema),
-      /** @type {import('zodex').SzType} */ (currentSchema)
+      /** @type {import('zodex').SzType} */ (stateObj.schemaContent)
     )];
     // console.log(
     //   'vvv', v, currentSchema,
@@ -12961,6 +12979,10 @@ const arrayType = {
               const typeChoices = this.$getTypeChoices();
               typeChoices.$setType({
                 type, baseValue: value, bringIntoFocus,
+                specificSchema:
+                  schema?.type === 'union' && schemaIdx !== undefined
+                    ? schema.options[schemaIdx]
+                    : schema,
                 avoidReport: true
               });
               const root = typeChoices.$getTypeRoot();

package/dist/typeChoices.d.ts

@@ -3,7 +3,8 @@
  *   type: string,
  *   baseValue?: import('./formats.js').StructuredCloneValue,
  *   bringIntoFocus?: boolean,
- *   avoidReport?: boolean
+ *   avoidReport?: boolean,
+ *   specificSchema?: import('zodex').SzType
  * }) => void} SetType
  */
 /**
@@ -89,6 +90,7 @@ export type SetType = (cfg: {
     baseValue?: import("./formats.js").StructuredCloneValue;
     bringIntoFocus?: boolean;
     avoidReport?: boolean;
+    specificSchema?: import("zodex").SzType;
 }) => void;
 export type AddTypeAndEditUI = (info: {
     type: string;

package/dist/typeChoices.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"typeChoices.d.ts","sourceRoot":"","sources":["../src/typeChoices.js"],"names":[],"mappings":"AASA;;;;;;;GAOG;AAEH;;;;;;GAMG;AAEH;;;;;;;GAOG;AAEH;;GAEG;AAEH;;;;;GAKG;AAEH;;;;;;GAMG;AAEH;;;GAGG;AAEH;;;GAGG;AAEH;;;;;GAKG;AAEH;;;;;;;;;;;;;;;;;;;;;;;;;;;;GA4BG;AAEH;;GAEG;AACH,+BAFU,gBAAgB,CAiUxB;sBA7ZW,CAAC,GAAG,EAAE;IAClB,IAAQ,EAAE,MAAM,CAAC;IACjB,SAAa,CAAC,EAAE,OAAO,cAAc,EAAE,oBAAoB,CAAC;IAC5D,cAAkB,CAAC,EAAE,OAAO,CAAC;IAC7B,WAAe,CAAC,EAAE,OAAO,CAAA;CACtB,KAAK,IAAI;+BAIA,CAAC,IAAI,EAAE;IACnB,IAAQ,EAAE,MAAM,CAAC;IACjB,MAAU,EAAE,OAAO,CAAC;IACpB,cAAkB,CAAC,EAAE,OAAO,OAAO,EAAE,MAAM,CAAA;CACxC,KAAK,IAAI;mCAIA,CAAC,IAAI,CAAC,EAAE;IACpB,SAAa,CAAC,EAAE,OAAO,cAAc,EAAE,oBAAoB,CAAC;IAC5D,cAAkB,CAAC,EAAE,OAAO,CAAC;IAC7B,YAAgB,CAAC,EAAE,OAAO,2BAA2B,EAAE,WAAW,CAAC;IACnE,WAAe,CAAC,EAAE,OAAO,CAAA;CACtB,KAAK,IAAI;wBAIA,MAAM,IAAI;oCAIV,WAAW,GAAG;IAC1B,qBAAyB,EAAE,oBAAoB,CAAC;IAChD,UAAc,EAAE,SAAS,CAAA;CACtB;sHAQS,OAAO,cAAc,EAAE,oBAAoB;4BAK3C,MAAM;mCAKN,OAAO;+BAKT,OAAO,cAAc,EAAE,oBAAoB,YAC3C,OAAO,YAAY,EAAE,WAAW,KAC9B,OAAO,CAAC,IAAI,CAAC;qCAKf;IACV,WAAe,CAAC,EAAE,OAAO,CAAC;IAC1B,MAAU,EAAE,OAAO,cAAc,EAAE,eAAe,CAAC;IACnD,aAAiB,CAAC,EAAE,MAAM,CAAC;IAC3B,KAAS,CAAC,EAAE,OAAO,cAAc,EAAE,oBAAoB,CAAC;IACxD,QAAY,CAAC,EAAE,OAAO,CAAC;IACvB,KAAS,CAAC,EAAE,MAAM,CAAC;IACnB,WAAe,CAAC,EAAE,MAAM,CAAC;IACzB,cAAkB,CAAC,EAAE,MAAM,CAAC;IAC5B,aAAiB,CAAC,EAAE,OAAO,CAAC;IAC5B,cAAkB,CAAC,EAAE,OAAO,CAAC;IAC7B,OAAW,CAAC,EAAE,OAAO,YAAY,EAAE,WAAW,CAAC;IAC/C,OAAW,CAAC,EAAE,OAAO,cAAc,EAAE,OAAO,CAAA;IAC5C,KAAS,CAAC,EAAE,OAAO,YAAY,EAAE,OAAO,CAAA;IACxC,MAAU,CAAC,EAAE,MAAM,CAAC;IACpB,SAAa,CAAC,EAAE,MAAM,CAAC;IACvB,cAAkB,CAAC,EAAE,OAAO,2BAA2B,EAAE,WAAW,CAAC;IACrE,aAAiB,CAAC,EAAE,OAAO,2BAA2B,EAAE,WAAW,CAAC;CACjE,KACS;IACZ,QAAY,EAAE,CAAC,MAAM,EAAE,WAAW,EAAE,aAAa,EAAE,WAAW,CAAC,CAAC;IAChE,QAAY,EAAE,QAAQ,CAAC;IACvB,OAAW,EAAE,OAAO,CAAC;IACrB,cAAkB,EAAE,cAAc,CAAC;IACnC,QAAY,EAAE,QAAQ,CAAA;CACnB"}
+{"version":3,"file":"typeChoices.d.ts","sourceRoot":"","sources":["../src/typeChoices.js"],"names":[],"mappings":"AASA;;;;;;;;GAQG;AAEH;;;;;;GAMG;AAEH;;;;;;;GAOG;AAEH;;GAEG;AAEH;;;;;GAKG;AAEH;;;;;;GAMG;AAEH;;;GAGG;AAEH;;;GAGG;AAEH;;;;;GAKG;AAEH;;;;;;;;;;;;;;;;;;;;;;;;;;;;GA4BG;AAEH;;GAEG;AACH,+BAFU,gBAAgB,CAiVxB;sBA9aW,CAAC,GAAG,EAAE;IAClB,IAAQ,EAAE,MAAM,CAAC;IACjB,SAAa,CAAC,EAAE,OAAO,cAAc,EAAE,oBAAoB,CAAC;IAC5D,cAAkB,CAAC,EAAE,OAAO,CAAC;IAC7B,WAAe,CAAC,EAAE,OAAO,CAAC;IAC1B,cAAkB,CAAC,EAAE,OAAO,OAAO,EAAE,MAAM,CAAA;CACxC,KAAK,IAAI;+BAIA,CAAC,IAAI,EAAE;IACnB,IAAQ,EAAE,MAAM,CAAC;IACjB,MAAU,EAAE,OAAO,CAAC;IACpB,cAAkB,CAAC,EAAE,OAAO,OAAO,EAAE,MAAM,CAAA;CACxC,KAAK,IAAI;mCAIA,CAAC,IAAI,CAAC,EAAE;IACpB,SAAa,CAAC,EAAE,OAAO,cAAc,EAAE,oBAAoB,CAAC;IAC5D,cAAkB,CAAC,EAAE,OAAO,CAAC;IAC7B,YAAgB,CAAC,EAAE,OAAO,2BAA2B,EAAE,WAAW,CAAC;IACnE,WAAe,CAAC,EAAE,OAAO,CAAA;CACtB,KAAK,IAAI;wBAIA,MAAM,IAAI;oCAIV,WAAW,GAAG;IAC1B,qBAAyB,EAAE,oBAAoB,CAAC;IAChD,UAAc,EAAE,SAAS,CAAA;CACtB;sHAQS,OAAO,cAAc,EAAE,oBAAoB;4BAK3C,MAAM;mCAKN,OAAO;+BAKT,OAAO,cAAc,EAAE,oBAAoB,YAC3C,OAAO,YAAY,EAAE,WAAW,KAC9B,OAAO,CAAC,IAAI,CAAC;qCAKf;IACV,WAAe,CAAC,EAAE,OAAO,CAAC;IAC1B,MAAU,EAAE,OAAO,cAAc,EAAE,eAAe,CAAC;IACnD,aAAiB,CAAC,EAAE,MAAM,CAAC;IAC3B,KAAS,CAAC,EAAE,OAAO,cAAc,EAAE,oBAAoB,CAAC;IACxD,QAAY,CAAC,EAAE,OAAO,CAAC;IACvB,KAAS,CAAC,EAAE,MAAM,CAAC;IACnB,WAAe,CAAC,EAAE,MAAM,CAAC;IACzB,cAAkB,CAAC,EAAE,MAAM,CAAC;IAC5B,aAAiB,CAAC,EAAE,OAAO,CAAC;IAC5B,cAAkB,CAAC,EAAE,OAAO,CAAC;IAC7B,OAAW,CAAC,EAAE,OAAO,YAAY,EAAE,WAAW,CAAC;IAC/C,OAAW,CAAC,EAAE,OAAO,cAAc,EAAE,OAAO,CAAA;IAC5C,KAAS,CAAC,EAAE,OAAO,YAAY,EAAE,OAAO,CAAA;IACxC,MAAU,CAAC,EAAE,MAAM,CAAC;IACpB,SAAa,CAAC,EAAE,MAAM,CAAC;IACvB,cAAkB,CAAC,EAAE,OAAO,2BAA2B,EAAE,WAAW,CAAC;IACrE,aAAiB,CAAC,EAAE,OAAO,2BAA2B,EAAE,WAAW,CAAC;CACjE,KACS;IACZ,QAAY,EAAE,CAAC,MAAM,EAAE,WAAW,EAAE,aAAa,EAAE,WAAW,CAAC,CAAC;IAChE,QAAY,EAAE,QAAQ,CAAC;IACvB,OAAW,EAAE,OAAO,CAAC;IACrB,cAAkB,EAAE,cAAc,CAAC;IACnC,QAAY,EAAE,QAAQ,CAAA;CACnB"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@es-joy/jsoe",
-  "version": "0.20.0",
+  "version": "0.20.2",
   "type": "module",
   "types": "./dist/index.d.ts",
   "main": "./src/index.js",

package/src/formats/schema.js

@@ -555,6 +555,7 @@ export function getTypesForSchema (schemaObject, originalJSON) {
     ]);
   default: {
     if ('$ref' in schemaObject) {
+      // console.log('originalJSON', originalJSON, schemaObject.$ref);
       const refObj = resolveJSONPointer({
         obj: originalJSON,
         path: /** @type {import('zodex').SzRef} */ (schemaObject).$ref
@@ -651,7 +652,7 @@ const schema = {
     }
     const schemaObjects = [...getTypesForSchema(
       /** @type {import('zodex').SzType} */ (currentSchema),
-      /** @type {import('zodex').SzType} */ (currentSchema)
+      /** @type {import('zodex').SzType} */ (stateObj.schemaContent)
     )];
     // console.log(
     //   'vvv', v, currentSchema,

package/src/formats/structuredCloning.js

@@ -214,7 +214,7 @@ const encapsulateObserver = (stateObj) => {
         buildTypeChoices,
         format,
         specificSchemaObject: schema,
-        schemaContent: schema ?? schemaContent,
+        schemaContent,
         value: newValue,
         hasValue: true,
         // Not currently in use but may be convenient for a

package/src/fundamentalTypes/arrayType.js

@@ -2271,6 +2271,10 @@ const arrayType = {
               const typeChoices = this.$getTypeChoices();
               typeChoices.$setType({
                 type, baseValue: value, bringIntoFocus,
+                specificSchema:
+                  schema?.type === 'union' && schemaIdx !== undefined
+                    ? schema.options[schemaIdx]
+                    : schema,
                 avoidReport: true
               });
               const root = typeChoices.$getTypeRoot();

package/src/typeChoices.js

@@ -12,7 +12,8 @@ import dialogs from './utils/dialogs.js';
  *   type: string,
  *   baseValue?: import('./formats.js').StructuredCloneValue,
  *   bringIntoFocus?: boolean,
- *   avoidReport?: boolean
+ *   avoidReport?: boolean,
+ *   specificSchema?: import('zodex').SzType
  * }) => void} SetType
  */
 
@@ -161,8 +162,22 @@ export const buildTypeChoices = ({
     $custom: {
       $getValue,
       /** @type {SetType} */
-      $setType ({type, baseValue, bringIntoFocus, avoidReport}) {
-        this.value = type;
+      $setType ({
+        type, baseValue, bringIntoFocus, avoidReport, specificSchema
+      }) {
+        if (schemaObjs && specificSchema) {
+          const idx = schemaObjs.map((obj) => {
+            return JSON.stringify(obj);
+          }).indexOf(JSON.stringify(specificSchema));
+          if (idx === -1) {
+            console.log('schemaObjs', schemaObjs, specificSchema);
+            this.value = type;
+          } else {
+            this.selectedIndex = idx + 1;
+          }
+        } else {
+          this.value = type;
+        }
         this.$setStyles();
         this.$addAndValidateEditUI({baseValue, bringIntoFocus, avoidReport});
       },
@@ -174,7 +189,9 @@ export const buildTypeChoices = ({
        */
       $setTypeNoEditUI ({type, specificSchema}) {
         if (schemaObjs && specificSchema) {
-          const idx = schemaObjs.indexOf(specificSchema);
+          const idx = schemaObjs.map((obj) => {
+            return JSON.stringify(obj);
+          }).indexOf(JSON.stringify(specificSchema));
           this.selectedIndex = idx + 1;
         } else {
           this.value = type;