pacc 4.33.0 → 4.34.1

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "pacc",
-  "version": "4.33.0",
+  "version": "4.34.1",
   "publishConfig": {
     "access": "public",
     "provenance": true

package/src/attributes.mjs

@@ -1,42 +1,5 @@
 import { getAttribute } from "./settergetter.mjs";
-
-export const baseTypes = new Set(["string", "number", "bigint", "boolean"]);
-
-export const types = {
-  base: { name: "base" },
-
-  string: { name: "string", extends: "base" },
-  number: {
-    name: "number",
-    extends: "base",
-    prepareValue: value =>
-      typeof value === "string" ? parseFloat(value) : value
-  },
-  boolean: {
-    name: "boolean",
-    extends: "base",
-    prepareValue: value =>
-      !value ||
-      value === "0" ||
-      value === "false" ||
-      value === "no"
-        ? false
-        : true
-  },
-  integer: {
-    name: "integer",
-    extends: "base",
-    prepareValue: value => (typeof value === "string" ? parseInt(value) : value)
-  },
-  "unsigned-integer": {
-    name: "unsigned-integer",
-    prepareValue: value =>
-      typeof value === "string" ? parseInt(value) : value,
-    extends: "integer"
-  },
-  url: { name: "url", extends: "string" },
-  object: { name: "object", extends: "base" }
-};
+import { types } from "./types.mjs";
 
 /**
  * Create attributes from its definition.

package/src/common-attributes.mjs

@@ -1,4 +1,4 @@
-import { types } from "./attributes.mjs";
+import { types } from "./types.mjs";
 
 /**
  * @typedef {Object} AttributeDefinition

package/src/module.mjs

@@ -1,7 +1,8 @@
+export * from "./types.mjs";
+export * from "./attributes.mjs";
 export * from "./tokens.mjs";
 export * from "./filter.mjs";
 export * from "./multiple.mjs";
-export * from "./attributes.mjs";
 export * from "./common-attributes.mjs";
 export * from "./properties.mjs";
 export * from "./expression.mjs";

package/src/types.mjs

@@ -0,0 +1,72 @@
+export const baseTypes = new Set(["string", "number", "bigint", "boolean"]);
+
+export const types = {
+  base: { name: "base" },
+
+  string: { name: "string", extends: "base" },
+  number: {
+    name: "number",
+    extends: "base",
+    prepareValue: value =>
+      typeof value === "string" ? parseFloat(value) : value
+  },
+  boolean: {
+    name: "boolean",
+    extends: "base",
+    prepareValue: value =>
+      !value || value === "0" || value === "false" || value === "no"
+        ? false
+        : true
+  },
+  integer: {
+    name: "integer",
+    extends: "base",
+    prepareValue: value => (typeof value === "string" ? parseInt(value) : value)
+  },
+  "unsigned-integer": {
+    name: "unsigned-integer",
+    prepareValue: value =>
+      typeof value === "string" ? parseInt(value) : value,
+    extends: "integer"
+  },
+  url: { name: "url", extends: "string" },
+  object: { name: "object", extends: "base" }
+};
+
+export function addType(type) {
+  types[type.name] = type;
+  return type;
+}
+
+export function oneOfType(definition) {
+  const aggregate = list =>
+    list.reduce(
+      (a, c) => a.union(c.members ?? new Set([types[c] ?? c])),
+      new Set()
+    );
+
+  if (Array.isArray(definition)) {
+    const name = definition
+      .map(t => t.name ?? t)
+      .sort()
+      .join("|");
+
+    return (
+      types[name] ||
+      addType({
+        name,
+        members: aggregate(definition)
+      })
+    );
+  } else {
+    const parts = definition.split("|").sort();
+    const name = parts.join("|");
+    return (
+      types[name] ||
+      addType({
+        name,
+        members: aggregate(parts.map(t => types[t]))
+      })
+    );
+  }
+}

package/types/attributes.d.mts

@@ -16,41 +16,3 @@ export function attributeIterator(definition: any, filter: Function, path?: stri
 export function writableAttributeIterator(definition: any): Generator<[string[], any], void, any>;
 export function prepareValue(value: any, attribute: any): any;
 export function manadatoryAttributesPresent(object: any, attributes: any): boolean;
-export const baseTypes: Set<string>;
-export const types: {
-    base: {
-        name: string;
-    };
-    string: {
-        name: string;
-        extends: string;
-    };
-    number: {
-        name: string;
-        extends: string;
-        prepareValue: (value: any) => any;
-    };
-    boolean: {
-        name: string;
-        extends: string;
-        prepareValue: (value: any) => boolean;
-    };
-    integer: {
-        name: string;
-        extends: string;
-        prepareValue: (value: any) => any;
-    };
-    "unsigned-integer": {
-        name: string;
-        prepareValue: (value: any) => any;
-        extends: string;
-    };
-    url: {
-        name: string;
-        extends: string;
-    };
-    object: {
-        name: string;
-        extends: string;
-    };
-};

package/types/module.d.mts

@@ -1,7 +1,8 @@
+export * from "./types.mjs";
+export * from "./attributes.mjs";
 export * from "./tokens.mjs";
 export * from "./filter.mjs";
 export * from "./multiple.mjs";
-export * from "./attributes.mjs";
 export * from "./common-attributes.mjs";
 export * from "./properties.mjs";
 export * from "./expression.mjs";

package/types/types.d.mts

@@ -0,0 +1,40 @@
+export function addType(type: any): any;
+export function oneOfType(definition: any): any;
+export const baseTypes: Set<string>;
+export const types: {
+    base: {
+        name: string;
+    };
+    string: {
+        name: string;
+        extends: string;
+    };
+    number: {
+        name: string;
+        extends: string;
+        prepareValue: (value: any) => any;
+    };
+    boolean: {
+        name: string;
+        extends: string;
+        prepareValue: (value: any) => boolean;
+    };
+    integer: {
+        name: string;
+        extends: string;
+        prepareValue: (value: any) => any;
+    };
+    "unsigned-integer": {
+        name: string;
+        prepareValue: (value: any) => any;
+        extends: string;
+    };
+    url: {
+        name: string;
+        extends: string;
+    };
+    object: {
+        name: string;
+        extends: string;
+    };
+};