@zcomponent/core 1.8.1-beta → 1.9.0

package/lib/contexts/globaltagcontext.d.ts

@@ -0,0 +1,5 @@
+import { Component } from "../component";
+import { Context } from "../context";
+export declare class GlobalTagContext extends Context {
+    componentsByGlobalTag: Map<string, Set<Component<any, import("../component").ConstructorProps>>>;
+}

package/lib/contexts/globaltagcontext.js

@@ -0,0 +1,7 @@
+import { Context } from "../context";
+export class GlobalTagContext extends Context {
+    constructor() {
+        super(...arguments);
+        this.componentsByGlobalTag = new Map();
+    }
+}

package/lib/contexts/tagcontext.d.ts

@@ -3,7 +3,7 @@ import { ContextManager, Context } from "../context";
 export declare class TagContext extends Context {
     tagsByComponent: Map<Component<any, import("../component").ConstructorProps>, Set<string>>;
     componentsByLocalTag: Map<string, Set<Component<any, import("../component").ConstructorProps>>>;
-    componentsByGlobalTag: Map<string, Set<Component<any, import("../component").ConstructorProps>>>;
+    private _global;
     registerComponent(component: Component, tags: string[]): void;
     unregisterComponent(component: Component): void;
     getComponentsByTag(tag: string): Set<Component>;

package/lib/contexts/tagcontext.js

@@ -1,15 +1,16 @@
 import { Context } from "../context";
+import { GlobalTagContext } from "./globaltagcontext";
 export class TagContext extends Context {
     constructor() {
         super(...arguments);
         this.tagsByComponent = new Map();
         this.componentsByLocalTag = new Map();
-        this.componentsByGlobalTag = new Map();
+        this._global = this.contextManager.get(GlobalTagContext);
     }
     registerComponent(component, tags) {
         this.unregisterComponent(component);
         for (const tag of tags) {
-            const map = tag.startsWith('global:') ? this.componentsByGlobalTag : this.componentsByLocalTag;
+            const map = !tag.startsWith('local:') ? this._global.componentsByGlobalTag : this.componentsByLocalTag;
             const set = map.get(tag) ?? new Set();
             set.add(component);
             map.set(tag, set);
@@ -22,7 +23,7 @@ export class TagContext extends Context {
         if (!tags)
             return;
         for (const tag of tags.values()) {
-            const map = tag.startsWith('global:') ? this.componentsByGlobalTag : this.componentsByLocalTag;
+            const map = !tag.startsWith('local:') ? this._global.componentsByGlobalTag : this.componentsByLocalTag;
             const entry = map.get(tag);
             if (!entry)
                 continue;
@@ -31,7 +32,7 @@ export class TagContext extends Context {
         this.tagsByComponent.delete(component);
     }
     getComponentsByTag(tag) {
-        return ((tag.startsWith('global:') ? this.componentsByGlobalTag : this.componentsByLocalTag).get(tag)) ?? new Set();
+        return ((tag.startsWith('global:') ? this._global.componentsByGlobalTag : this.componentsByLocalTag).get(tag)) ?? new Set();
     }
     getComponentsByTags(tags) {
         if (tags.length === 0)
@@ -40,7 +41,7 @@ export class TagContext extends Context {
             return this.getComponentsByTag(tags[0]);
         const ret = new Set();
         for (const tag of tags) {
-            const map = tag.startsWith('global:') ? this.componentsByGlobalTag : this.componentsByLocalTag;
+            const map = !tag.startsWith('local:') ? this._global.componentsByGlobalTag : this.componentsByLocalTag;
             const entries = map.get(tag);
             if (!entries)
                 continue;

package/lib/types.d.ts

@@ -29,7 +29,8 @@ export interface BooleanPrimitiveType extends BaseType {
 }
 export interface LiteralType extends BaseType {
     name: 'literal';
-    value: string | number | boolean | undefined | null;
+    value?: string | number | boolean | null;
+    isUndefined?: boolean;
 }
 export interface ArrayType extends BaseType {
     name: 'array';

package/lib/types.js

@@ -220,6 +220,7 @@ export function mergeTypes(a, b) {
                 name: a.name,
                 typeHint,
                 value: a.value,
+                isUndefined: a.isUndefined,
                 comments: mergeComments(a.comments ?? [], b.comments ?? []),
             };
         case 'array': {
@@ -323,6 +324,8 @@ export function isValidValueForType(def, t, allowUndefined) {
             return false;
         }
         case 'literal':
+            if (def === undefined && t.isUndefined)
+                return true;
             return def === t.value;
         case 'function':
             return false;
@@ -352,7 +355,7 @@ function getBasicType(t) {
         case 'entity':
             return t.name;
         case 'literal': {
-            if (t.value === undefined)
+            if (t.isUndefined || t.value === undefined)
                 return 'undefined';
             return JSON.stringify(t.value);
         }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@zcomponent/core",
-  "version": "1.8.1-beta",
+  "version": "1.9.0",
   "description": "",
   "main": "index.js",
   "types": "index.d.ts",