@json-layout/vocabulary 0.3.0 → 0.5.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@json-layout/vocabulary",
-  "version": "0.3.0",
+  "version": "0.5.0",
   "description": "Main JSON Layout vocabulary as JSON schemas and Typescript types. Also contains some small utility functions to validate and normalize annotations.",
   "type": "module",
   "exports": {

package/src/normalize.js

@@ -152,8 +152,8 @@ function getPartialCompObject (layoutKeyword) {
  * @returns {Expression}
  */
 function normalizeExpression (expression, defaultType = 'js-eval') {
-  if (typeof expression === 'string') return { type: defaultType, expr: expression }
-  else return { ...expression, type: expression.type ?? defaultType }
+  if (typeof expression === 'string') return { type: defaultType, expr: expression, pure: true }
+  else return { pure: true, type: defaultType, ...expression }
 }
 
 /**

package/src/normalized-layout/index.js

@@ -35,7 +35,7 @@ import schema from './schema.js'
  * @typedef {import('./types.js').Combobox} Combobox
  * @typedef {import('./types.js').Cols} Cols
  * @typedef {import('./types.js').ColsObj} ColsObj
- * @typedef {import('./types.js').StateNodeOptions} StateNodeOptions
+ * @typedef {import('./types.js').StateNodeOptionsBase} StateNodeOptionsBase
  * @typedef {import('./types.js').Slot} Slot
  * @typedef {{ errors: any, (layoutKeyword: any): layoutKeyword is NormalizedLayout }} ValidateNormalizedLayout
  */

package/src/normalized-layout/schema.js

@@ -79,7 +79,7 @@ export default {
               ]
             },
             "options": {
-              "$ref": "#/$defs/state-node-options"
+              "$ref": "#/$defs/state-node-options-base"
             }
           }
         },
@@ -869,7 +869,8 @@ export default {
       "type": "object",
       "required": [
         "type",
-        "expr"
+        "expr",
+        "pure"
       ],
       "properties": {
         "type": {
@@ -883,6 +884,9 @@ export default {
         "expr": {
           "type": "string"
         },
+        "pure": {
+          "type": "boolean"
+        },
         "ref": {
           "type": "integer",
           "readOnly": true
@@ -962,11 +966,11 @@ export default {
         }
       ]
     },
-    "state-node-options": {
+    "state-node-options-base": {
       "type": "object",
       "allOf": [
         {
-          "$ref": "#/$defs/state-node-options-lib"
+          "$ref": "#/$defs/state-node-options-base-lib"
         },
         {
           "properties": {
@@ -988,7 +992,7 @@ export default {
         }
       ]
     },
-    "state-node-options-lib": {
+    "state-node-options-base-lib": {
       "type": "object",
       "patternProperties": {
         ".*": {}

package/src/normalized-layout/schema.json

@@ -44,7 +44,7 @@
                 }
               ]
             },
-            "options": {"$ref": "#/$defs/state-node-options"}
+            "options": {"$ref": "#/$defs/state-node-options-base"}
           }
         },
         {
@@ -397,7 +397,7 @@
     },
     "expression": {
       "type": "object",
-      "required": ["type", "expr"],
+      "required": ["type", "expr", "pure"],
       "properties": {
         "type": {
           "type": "string",
@@ -406,6 +406,9 @@
         "expr": {
           "type": "string"
         },
+        "pure": {
+          "type": "boolean"
+        },
         "ref": {
           "type": "integer",
           "readOnly": true
@@ -458,10 +461,10 @@
         }
       ]
     },
-    "state-node-options": {
+    "state-node-options-base": {
       "type": "object",
       "allOf": [
-        {"$ref": "#/$defs/state-node-options-lib"},
+        {"$ref": "#/$defs/state-node-options-base-lib"},
         {
           "properties": {
             "readOnly": {"type": "boolean", "default": false},
@@ -471,7 +474,7 @@
         }
       ]
     },
-    "state-node-options-lib": {
+    "state-node-options-base-lib": {
       "type": "object",
       "patternProperties": {
         ".*": {}

package/src/normalized-layout/types.ts

@@ -13,7 +13,7 @@ export type CompObject = {
     component?: Slot;
     [k: string]: unknown;
   };
-  options?: StateNodeOptions;
+  options?: StateNodeOptionsBase;
   [k: string]: unknown;
 } & (
   | None
@@ -55,7 +55,7 @@ export type Slot =
   | {
       name: string;
     };
-export type StateNodeOptions = StateNodeOptionsLib & {
+export type StateNodeOptionsBase = StateNodeOptionsBaseLib & {
   readOnly?: boolean;
   summary?: boolean;
   titleDepth?: number;
@@ -90,6 +90,7 @@ export interface SwitchStruct {
 export interface Expression {
   type: "js-fn" | "js-eval" | "js-tpl";
   expr: string;
+  pure: boolean;
   ref?: number;
   [k: string]: unknown;
 }
@@ -111,9 +112,9 @@ export interface StateNodePropsLib {
 export interface StateNodeSlotsLib {
   [k: string]: Slot;
 }
-export interface StateNodeOptionsLib {
+export interface StateNodeOptionsBaseLib {
   /**
-   * This interface was referenced by `StateNodeOptionsLib`'s JSON-Schema definition
+   * This interface was referenced by `StateNodeOptionsBaseLib`'s JSON-Schema definition
    * via the `patternProperty` ".*".
    */
   [k: string]: unknown;