nesoi 3.2.9 → 3.3.1

package/lib/elements/blocks/machine/machine_state.builder.js

@@ -5,7 +5,7 @@ const machine_schema_1 = require("./machine.schema");
 const machine_transition_builder_1 = require("./machine_transition.builder");
 const dependency_1 = require("../../../engine/dependency");
 const block_builder_1 = require("../block.builder");
-const name_helpers_1 = require("../../../compiler/helpers/name_helpers");
+const name_helpers_1 = require("../../../engine/util/name_helpers");
 const machine_job_builder_1 = require("../job/internal/machine_job.builder");
 /**
  * @category Builders
@@ -32,16 +32,15 @@ class MachineStateBuilder extends block_builder_1.BlockBuilder {
     beforeEnter(def) {
         const machineName = this.machine.name;
         const name = `${machineName}@${this.name}__before_enter`;
-        const builder = new machine_job_builder_1.MachineJobBuilder(this.module, name, `Before Enter ${this._alias || this.name}`, this._authn);
+        const builder = new machine_job_builder_1.MachineJobBuilder(this.module, name, `Before Enter ${this._alias || this.name}`, this._auth);
         def(builder);
-        this._jobs.beforeEnter = new dependency_1.$Dependency(this.module, 'job', name);
+        const tag = new dependency_1.Tag(this.module, 'job', name);
+        this._jobs.beforeEnter = new dependency_1.Dependency(this.module, tag, { runtime: true });
         // Inline nodes are registered on the machine builder,
         // since a machine state is not a BuilderNode
         const _inlineNodes = this.machine._inlineNodes;
         _inlineNodes.push(new dependency_1.BuilderNode({
-            module: this.module,
-            type: 'job',
-            name: name,
+            tag: new dependency_1.Tag(this.module, 'job', name),
             builder: builder,
             isInline: true,
             filepath: [], // This is added later by Treeshake.blockInlineNodes()
@@ -52,16 +51,15 @@ class MachineStateBuilder extends block_builder_1.BlockBuilder {
     afterEnter(def) {
         const machineName = this.machine.name;
         const name = `${machineName}@${this.name}__after_enter`;
-        const builder = new machine_job_builder_1.MachineJobBuilder(this.module, name, `On Enter ${this._alias || this.name}`, this._authn);
+        const builder = new machine_job_builder_1.MachineJobBuilder(this.module, name, `On Enter ${this._alias || this.name}`, this._auth);
         def(builder);
-        this._jobs.afterEnter = new dependency_1.$Dependency(this.module, 'job', name);
+        const tag = new dependency_1.Tag(this.module, 'job', name);
+        this._jobs.afterEnter = new dependency_1.Dependency(this.module, tag, { runtime: true });
         // Inline nodes are registered on the machine builder,
         // since a machine state is not a BuilderNode
         const _inlineNodes = this.machine._inlineNodes;
         _inlineNodes.push(new dependency_1.BuilderNode({
-            module: this.module,
-            type: 'job',
-            name: name,
+            tag: new dependency_1.Tag(this.module, 'job', name),
             builder: builder,
             isInline: true,
             filepath: [], // This is added later by Treeshake.blockInlineNodes()
@@ -72,16 +70,15 @@ class MachineStateBuilder extends block_builder_1.BlockBuilder {
     beforeLeave(def) {
         const machineName = this.machine.name;
         const name = `${machineName}@${this.name}__before_leave`;
-        const builder = new machine_job_builder_1.MachineJobBuilder(this.module, name, `Before leave ${this._alias || this.name}`, this._authn);
+        const builder = new machine_job_builder_1.MachineJobBuilder(this.module, name, `Before leave ${this._alias || this.name}`, this._auth);
         def(builder);
-        this._jobs.beforeLeave = new dependency_1.$Dependency(this.module, 'job', name);
+        const tag = new dependency_1.Tag(this.module, 'job', name);
+        this._jobs.beforeLeave = new dependency_1.Dependency(this.module, tag, { runtime: true });
         // Inline nodes are registered on the machine builder,
         // since a machine state is not a BuilderNode
         const _inlineNodes = this.machine._inlineNodes;
         _inlineNodes.push(new dependency_1.BuilderNode({
-            module: this.module,
-            type: 'job',
-            name: name,
+            tag: new dependency_1.Tag(this.module, 'job', name),
             builder: builder,
             isInline: true,
             filepath: [], // This is added later by Treeshake.blockInlineNodes()
@@ -92,16 +89,15 @@ class MachineStateBuilder extends block_builder_1.BlockBuilder {
     afterLeave(def) {
         const machineName = this.machine.name;
         const name = `${machineName}@${this.name}__after_leave`;
-        const builder = new machine_job_builder_1.MachineJobBuilder(this.module, name, `On leave ${this._alias || this.name}`, this._authn);
+        const builder = new machine_job_builder_1.MachineJobBuilder(this.module, name, `On leave ${this._alias || this.name}`, this._auth);
         def(builder);
-        this._jobs.afterLeave = new dependency_1.$Dependency(this.module, 'job', name);
+        const tag = new dependency_1.Tag(this.module, 'job', name);
+        this._jobs.afterLeave = new dependency_1.Dependency(this.module, tag, { runtime: true });
         // Inline nodes are registered on the machine builder,
         // since a machine state is not a BuilderNode
         const _inlineNodes = this.machine._inlineNodes;
         _inlineNodes.push(new dependency_1.BuilderNode({
-            module: this.module,
-            type: 'job',
-            name: name,
+            tag: new dependency_1.Tag(this.module, 'job', name),
             builder: builder,
             isInline: true,
             filepath: [], // This is added later by Treeshake.blockInlineNodes()
@@ -112,7 +108,8 @@ class MachineStateBuilder extends block_builder_1.BlockBuilder {
     transition(msg, $) {
         const machineName = this.machine.name;
         const msgName = name_helpers_1.NameHelpers.unabbrevName(msg, machineName);
-        const msgDep = new dependency_1.$Dependency(this.module, 'message', msgName);
+        const tag = new dependency_1.Tag(this.module, 'message', msgName);
+        const msgDep = new dependency_1.Dependency(this.module, tag, { runtime: true });
         const builder = new machine_transition_builder_1.MachineTransitionBuilder(this.machine, this.module, this.name, msgDep);
         $(builder);
         if (!(msgName in this._transitions)) {
@@ -153,21 +150,26 @@ class MachineStateBuilder extends block_builder_1.BlockBuilder {
                 if (!($trans.to in transitions.to)) {
                     transitions.to[$trans.to] = {};
                 }
-                if (!($trans.msg.refName in transitions.to[$trans.to])) {
-                    transitions.to[$trans.to][$trans.msg.refName] = [];
+                if (!($trans.msg.short in transitions.to[$trans.to])) {
+                    transitions.to[$trans.to][$trans.msg.short] = [];
                 }
-                transitions.to[$trans.to][$trans.msg.refName].push($trans);
+                transitions.to[$trans.to][$trans.msg.short].push($trans);
                 // We also take note of unique transition input messages
-                if (!input.some(dep => dep.tag === $trans.msg.tag)) {
+                if (!input.some(tag => dependency_1.Tag.matches(tag, $trans.msg))) {
                     input.push($trans.msg);
                 }
             });
         });
         // Build this state
         const states = {};
-        states[builder.name] = new machine_schema_1.$MachineState(builder.module, builder.name, builder._alias || builder.name, builder._authn, builder._initial, builder._final, [], // This is filled by the machine (after all transitions are built)
+        states[builder.name] = new machine_schema_1.$MachineState(builder.module, builder.name, builder._alias || builder.name, builder._auth, builder._initial, builder._final, [], // This is filled by the machine (after all transitions are built)
         [], // This is filled by the machine (after all transitions are built)
-        builder._jobs);
+        {
+            beforeEnter: builder._jobs.beforeEnter?.tag,
+            afterEnter: builder._jobs.afterEnter?.tag,
+            beforeLeave: builder._jobs.beforeLeave?.tag,
+            afterLeave: builder._jobs.afterLeave?.tag,
+        });
         // Build substates
         for (const key in builder._states) {
             const childBuilder = builder._states[key];
@@ -177,7 +179,7 @@ class MachineStateBuilder extends block_builder_1.BlockBuilder {
             machine_transition_builder_1.MachineTransitionBuilder.merge(transitions, child.transitions);
             Object.values(child.states).forEach(state => {
                 state.input.forEach(msg => {
-                    if (!input.some(dep => dep.tag === msg.tag)) {
+                    if (!input.some(tag => dependency_1.Tag.matches(tag, msg))) {
                         input.push(msg);
                     }
                 });

package/lib/elements/blocks/machine/machine_transition.builder.d.ts

@@ -2,7 +2,7 @@ import { $Module, $Space } from "../../../schema";
 import { $Machine, $MachineTransition, $MachineTransitions } from './machine.schema';
 import { $Job, $JobAssert, $JobMethod } from "../job/job.schema";
 import { TrxNode } from "../../../engine/transaction/trx_node";
-import { $Dependency } from "../../../engine/dependency";
+import { Dependency } from "../../../engine/dependency";
 import { BlockBuilder } from '../block.builder';
 import { $Message } from "../../entities/message/message.schema";
 import { Overlay } from "../../../engine/util/type";
@@ -24,7 +24,7 @@ export declare class MachineTransitionBuilder<S extends $Space, M extends $Modul
     private _else?;
     private _to?;
     private _jobs;
-    constructor(machine: AnyMachineBuilder, module: string, _from: string, _msg: $Dependency, index?: number);
+    constructor(machine: AnyMachineBuilder, module: string, _from: string, _msg: Dependency, index?: number);
     as(alias: string): this;
     if<Assert extends $JobAssert<TrxNode<S, M, $M['#authn']>, $['#input']['#parsed'], never, {
         obj: $M['#data'];

package/lib/elements/blocks/machine/machine_transition.builder.js

@@ -11,7 +11,7 @@ const machine_job_builder_1 = require("../job/internal/machine_job.builder");
  */
 class MachineTransitionBuilder extends block_builder_1.BlockBuilder {
     constructor(machine, module, _from, _msg, index = 0) {
-        super(module, 'machine', `${_from}~${_msg.refName}`);
+        super(module, 'machine', `${_from}~${_msg.tag.short}`);
         this.machine = machine;
         this._from = _from;
         this._msg = _msg;
@@ -38,21 +38,21 @@ class MachineTransitionBuilder extends block_builder_1.BlockBuilder {
     }
     runJob(def) {
         if (typeof def === 'string') {
-            this._jobs.push(new dependency_1.$Dependency(this.module, 'job', def));
+            const tag = dependency_1.Tag.fromNameOrShort(this.module, 'job', def);
+            this._jobs.push(new dependency_1.Dependency(this.module, tag, { runtime: true }));
         }
         else {
             const machineName = this.machine.name;
             const name = `${machineName}@${this.name}#${this.index}`;
-            const builder = new machine_job_builder_1.MachineJobBuilder(this.module, name, this._alias || name, this._authn, [this._msg]);
+            const builder = new machine_job_builder_1.MachineJobBuilder(this.module, name, this._alias || name, this._auth, [this._msg]);
             def(builder);
-            this._jobs.push(new dependency_1.$Dependency(this.module, 'job', name));
+            const tag = new dependency_1.Tag(this.module, 'job', name);
+            this._jobs.push(new dependency_1.Dependency(this.module, tag, { runtime: true }));
             // Inline nodes are registered on the machine builder,
             // since a machine transition is not a BuilderNode
             const _inlineNodes = this.machine._inlineNodes;
             _inlineNodes.push(new dependency_1.BuilderNode({
-                module: this.module,
-                type: 'job',
-                name: name,
+                tag: new dependency_1.Tag(this.module, 'job', name),
                 builder: builder,
                 isInline: true,
                 filepath: [], // This is added later by Treeshake.blockInlineNodes()
@@ -89,7 +89,7 @@ class MachineTransitionBuilder extends block_builder_1.BlockBuilder {
     /** Build */
     static build(builder) {
         const transitions = [];
-        const self = new machine_schema_1.$MachineTransition(builder.module, builder.name, builder._alias || builder.name, builder._authn, builder._msg, builder._from, builder._to || builder._from, builder._condition, builder._jobs);
+        const self = new machine_schema_1.$MachineTransition(builder.module, builder.name, builder._alias || builder.name, builder._auth, builder._msg.tag, builder._from, builder._to || builder._from, builder._condition, builder._jobs.map(j => j.tag));
         transitions.push(self);
         if (builder._else) {
             const others = MachineTransitionBuilder.build(builder._else);

package/lib/elements/blocks/queue/queue.builder.d.ts

@@ -14,9 +14,9 @@ import { $Message } from "../../entities/message/message.schema";
 export declare class QueueBuilder<Space extends $Space, M extends $Module, $ extends $Queue> extends BlockBuilder<Space, M, 'queue'> {
     $b: "queue";
     constructor(module: string, name: string);
-    authn<U extends keyof Space['authnUsers']>(...providers: U[]): QueueBuilder<Space, M, $ & {
-        "#authn": U extends any[] ? U[number] : U;
-    }>;
+    auth<U extends keyof Space['authnUsers']>(provider: U, resolver?: (user: Space['authnUsers'][U]) => boolean): QueueBuilder<Space, M, Overlay<$, {
+        "#authn": $["#authn"] & { [K in U]: Space["authnUsers"][K]; };
+    }>>;
     message<Name extends string, Def extends MessageTemplateDef<Space, M, Name>, FullName extends string = `${$['name']}${Name extends '' ? '' : '.'}${Name & string}`, Msg extends $Message = $MessageInfer<FullName, ($: any) => ReturnType<Def>>>(name: Name, def: Def): QueueBuilder<Space, Overlay<M, {
         messages: Overlay<M["messages"], { [K in FullName]: Msg; }>;
     }>, $>;

package/lib/elements/blocks/queue/queue.builder.js

@@ -14,8 +14,8 @@ class QueueBuilder extends block_builder_1.BlockBuilder {
         this.$b = 'queue';
     }
     /* [Block] */
-    authn(...providers) {
-        return super.authn(...providers);
+    auth(provider, resolver) {
+        return super.auth(provider, resolver);
     }
     message(name, def) {
         return super.message(name, def);
@@ -25,7 +25,7 @@ class QueueBuilder extends block_builder_1.BlockBuilder {
     }
     // Build
     static build(node, tree, module) {
-        node.schema = new queue_schema_1.$Queue(node.builder.module, node.builder.name, node.builder._alias || node.builder.name, node.builder._authn, node.builder._inputMsgs);
+        node.schema = new queue_schema_1.$Queue(node.builder.module, node.builder.name, node.builder._alias || node.builder.name, node.builder._auth, node.builder._inputMsgs.map(m => m.tag));
         return {
             schema: node.schema,
             inlineMessages: message_builder_1.MessageBuilder.buildInlines(node, tree, module)

package/lib/elements/blocks/queue/queue.schema.d.ts

@@ -1,5 +1,5 @@
-import { $Dependency } from "../../../engine/dependency";
-import { $Block } from '../block.schema';
+import { Tag } from "../../../engine/dependency";
+import { $Block, $BlockAuth } from '../block.schema';
 /**
  * @category Schemas
  * @subcategory Block
@@ -8,9 +8,9 @@ export declare class $Queue extends $Block {
     module: string;
     name: string;
     alias: string;
-    authn: string[];
-    msgs: $Dependency[];
+    auth: $BlockAuth[];
+    msgs: Tag[];
     $t: "queue";
-    dependencies: $Dependency[];
-    constructor(module: string, name: string, alias: string, authn: string[], msgs: $Dependency[]);
+    dependencies: Tag[];
+    constructor(module: string, name: string, alias: string, auth: $BlockAuth[], msgs: Tag[]);
 }

package/lib/elements/blocks/queue/queue.schema.js

@@ -7,12 +7,12 @@ const block_schema_1 = require("../block.schema");
  * @subcategory Block
  */
 class $Queue extends block_schema_1.$Block {
-    constructor(module, name, alias, authn, msgs) {
-        super(module, name, alias, authn, msgs, {});
+    constructor(module, name, alias, auth, msgs) {
+        super(module, name, alias, auth, msgs, {});
         this.module = module;
         this.name = name;
         this.alias = alias;
-        this.authn = authn;
+        this.auth = auth;
         this.msgs = msgs;
         this.$t = 'queue';
         this.dependencies = [];

package/lib/elements/blocks/resource/resource.builder.d.ts

@@ -20,8 +20,8 @@ export declare class ResourceBuilder<Space extends $Space, Module extends $Modul
     private _jobs;
     private _bucket;
     constructor(module: string, name: Resource['name']);
-    authn<U extends keyof Space['authnUsers']>(...providers: U[]): ResourceBuilder<Space, Module, Overlay<Resource, {
-        "#authn": { [K in U]: Space["authnUsers"][U]; };
+    auth<U extends keyof Space['authnUsers']>(provider: U, resolver?: (user: Space['authnUsers'][U]) => boolean): ResourceBuilder<Space, Module, Overlay<Resource, {
+        "#authn": Resource["#authn"] & { [K in U]: Space["authnUsers"][U]; };
     }>>;
     bucket<B extends keyof Module['buckets']>(name: B): ResourceBuilder<Space, Module, Overlay<Resource, {
         "#bucket": Module["buckets"][B];

package/lib/elements/blocks/resource/resource.builder.js

@@ -8,7 +8,7 @@ const error_1 = require("../../../engine/data/error");
 const message_builder_1 = require("../../entities/message/message.builder");
 const bucket_model_convert_1 = require("../../entities/bucket/model/bucket_model.convert");
 const dependency_1 = require("../../../engine/dependency");
-const name_helpers_1 = require("../../../compiler/helpers/name_helpers");
+const name_helpers_1 = require("../../../engine/util/name_helpers");
 const job_builder_1 = require("../job/job.builder");
 const resource_1 = require("./resource");
 const resource_job_1 = require("../job/internal/resource_job");
@@ -23,19 +23,20 @@ class ResourceBuilder extends block_builder_1.BlockBuilder {
         this._jobs = {};
     }
     /* [Block] */
-    authn(...providers) {
-        return super.authn(...providers);
+    auth(provider, resolver) {
+        return super.auth(provider, resolver);
     }
     /* Bucket */
     bucket(name) {
-        this._bucket = new dependency_1.$Dependency(this.module, 'bucket', name);
+        const tag = dependency_1.Tag.fromNameOrShort(this.module, 'bucket', name);
+        this._bucket = new dependency_1.Dependency(this.module, tag, { build: true, compile: true, runtime: true });
         return this;
     }
     /* Read */
     view(...views) {
         const name = `${this.name}.view`;
         const alias = `View ${this._alias || this.name}`;
-        const jobBuilder = new resource_job_builder_1.ResourceJobBuilder(this.module, name, this._bucket.refName, 'view', alias, resource_1.Resource.view, this._authn)
+        const jobBuilder = new resource_job_builder_1.ResourceJobBuilder(this.module, name, this._bucket.tag.short, 'view', alias, resource_1.Resource.view, [...this._auth])
             .input($ => ({
             view: $.enum(views).default(views[0]),
             id: $.string_or_number.optional,
@@ -46,21 +47,19 @@ class ResourceBuilder extends block_builder_1.BlockBuilder {
         }))
             .prepare(resource_job_1.ResourceJob.prepareMsgData);
         this._inlineNodes.push(new dependency_1.BuilderNode({
-            module: this.module,
-            type: 'job',
-            name: name,
+            tag: new dependency_1.Tag(this.module, 'job', name),
             builder: jobBuilder,
             isInline: true,
             filepath: [], // This is added later by Treeshake.blockInlineNodes()
             dependencies: [] // This is added later by Treeshake.*()
         }));
-        this._jobs.view = new dependency_1.$Dependency(this.module, 'job', name);
+        this._jobs.view = new dependency_1.Dependency(this.module, new dependency_1.Tag(this.module, 'job', name), { runtime: true });
         return this;
     }
     query(...views) {
         const name = `${this.name}.query`;
         const alias = `Query ${this._alias || this.name}`;
-        const jobBuilder = new resource_job_builder_1.ResourceJobBuilder(this.module, name, this._bucket.refName, 'query', alias, resource_1.Resource.query, this._authn)
+        const jobBuilder = new resource_job_builder_1.ResourceJobBuilder(this.module, name, this._bucket.tag.short, 'query', alias, resource_1.Resource.query, [...this._auth])
             .input($ => ({
             view: $.enum(views).default(views[0]),
             query: $.dict($.any.optional).default({}),
@@ -69,83 +68,75 @@ class ResourceBuilder extends block_builder_1.BlockBuilder {
         }))
             .prepare(resource_job_1.ResourceJob.prepareMsgData);
         this._inlineNodes.push(new dependency_1.BuilderNode({
-            module: this.module,
-            type: 'job',
-            name: name,
+            tag: new dependency_1.Tag(this.module, 'job', name),
             builder: jobBuilder,
             isInline: true,
             filepath: [], // This is added later by Treeshake.blockInlineNodes()
             dependencies: [] // This is added later by Treeshake.*()
         }));
-        this._jobs.query = new dependency_1.$Dependency(this.module, 'job', name);
+        this._jobs.query = new dependency_1.Dependency(this.module, new dependency_1.Tag(this.module, 'job', name), { runtime: true });
         return this;
     }
     /* Create/Update/Delete */
     create($) {
         const name = `${this.name}.create`;
         const alias = `Create ${this._alias || this.name}`;
-        const jobBuilder = new resource_job_builder_1.ResourceJobBuilder(this.module, name, this._bucket.refName, 'create', alias, resource_1.Resource.create, this._authn, {
+        const jobBuilder = new resource_job_builder_1.ResourceJobBuilder(this.module, name, this._bucket.tag.short, 'create', alias, resource_1.Resource.create, [...this._auth], {
             id: ['string_or_number', undefined, false]
         })
             .prepare(resource_job_1.ResourceJob.prepareMsgData);
         $(jobBuilder);
         this._inlineNodes.push(new dependency_1.BuilderNode({
-            module: this.module,
-            type: 'job',
-            name: name,
+            tag: new dependency_1.Tag(this.module, 'job', name),
             builder: jobBuilder,
             isInline: true,
             filepath: [], // This is added later by Treeshake.blockInlineNodes()
             dependencies: [] // This is added later by Treeshake.*()
         }));
-        this._jobs.create = new dependency_1.$Dependency(this.module, 'job', name);
+        this._jobs.create = new dependency_1.Dependency(this.module, new dependency_1.Tag(this.module, 'job', name), { runtime: true });
         return this;
     }
     update($) {
         const name = `${this.name}.update`;
         const alias = `Update ${this._alias || this.name}`;
-        const jobBuilder = new resource_job_builder_1.ResourceJobBuilder(this.module, name, this._bucket.refName, 'update', alias, resource_1.Resource.update, this._authn, {
+        const jobBuilder = new resource_job_builder_1.ResourceJobBuilder(this.module, name, this._bucket.tag.short, 'update', alias, resource_1.Resource.update, [...this._auth], {
             id: ['string_or_number', undefined, true]
         })
             .prepare(resource_job_1.ResourceJob.prepareMsgData);
         $(jobBuilder);
         this._inlineNodes.push(new dependency_1.BuilderNode({
-            module: this.module,
-            type: 'job',
-            name: name,
+            tag: new dependency_1.Tag(this.module, 'job', name),
             builder: jobBuilder,
             isInline: true,
             filepath: [], // This is added later by Treeshake.blockInlineNodes()
             dependencies: [] // This is added later by Treeshake.*()
         }));
-        this._jobs.update = new dependency_1.$Dependency(this.module, 'job', name);
+        this._jobs.update = new dependency_1.Dependency(this.module, new dependency_1.Tag(this.module, 'job', name), { runtime: true });
         return this;
     }
     delete($) {
         const name = `${this.name}.delete`;
         const alias = `Delete ${this._alias || this.name}`;
-        const jobBuilder = new resource_job_builder_1.ResourceJobBuilder(this.module, name, this._bucket.refName, 'delete', alias, resource_1.Resource.delete, this._authn, {
+        const jobBuilder = new resource_job_builder_1.ResourceJobBuilder(this.module, name, this._bucket.tag.short, 'delete', alias, resource_1.Resource.delete, [...this._auth], {
             id: ['string_or_number', undefined, true]
         })
             .prepare(resource_job_1.ResourceJob.prepareTrue);
         $(jobBuilder);
         this._inlineNodes.push(new dependency_1.BuilderNode({
-            module: this.module,
-            type: 'job',
-            name: name,
+            tag: new dependency_1.Tag(this.module, 'job', name),
             builder: jobBuilder,
             isInline: true,
             filepath: [], // This is added later by Treeshake.blockInlineNodes()
             dependencies: [] // This is added later by Treeshake.*()
         }));
-        this._jobs.delete = new dependency_1.$Dependency(this.module, 'job', name);
+        this._jobs.delete = new dependency_1.Dependency(this.module, new dependency_1.Tag(this.module, 'job', name), { runtime: true });
         return this;
     }
     // Build
     static build(node, tree, module) {
-        const bucket = tree.getSchema(node.builder._bucket);
+        const bucket = dependency_1.Tag.resolve(node.builder._bucket.tag, tree);
         if (!bucket) {
-            throw error_1.NesoiError.Builder.Resource.BucketNotFound(node.builder.name, node.builder._bucket.refName);
+            throw error_1.NesoiError.Builder.Resource.BucketNotFound(node.builder.name, node.builder._bucket.tag.short);
         }
         const model = bucket.model;
         const modelName = name_helpers_1.NameHelpers.nameLowToHigh(bucket.name);
@@ -155,7 +146,7 @@ class ResourceBuilder extends block_builder_1.BlockBuilder {
         // view
         const viewDep = node.builder._jobs.view;
         if (viewDep) {
-            inlineJobsConfig[viewDep.name] = {
+            inlineJobsConfig[viewDep.tag.name] = {
                 ResourceJob: {
                     output: { raw: modelName + ' | ' + modelName + '[]' },
                     defaultTrigger: undefined
@@ -165,7 +156,7 @@ class ResourceBuilder extends block_builder_1.BlockBuilder {
         // query
         const queryDep = node.builder._jobs.query;
         if (queryDep) {
-            inlineJobsConfig[queryDep.name] = {
+            inlineJobsConfig[queryDep.tag.name] = {
                 ResourceJob: {
                     idType: null,
                     output: { raw: modelName + '[]' },
@@ -176,8 +167,8 @@ class ResourceBuilder extends block_builder_1.BlockBuilder {
         // create
         const createDep = node.builder._jobs.create;
         if (createDep) {
-            const defaultTrigger = (0, bucket_model_convert_1.convertToMessage)(module.name, model, createDep.name, `Create ${node.builder._alias || node.builder.name}`, [], [], ['id']);
-            inlineJobsConfig[createDep.name] = {
+            const defaultTrigger = (0, bucket_model_convert_1.convertToMessage)(module.name, model, createDep.tag.name, `Create ${node.builder._alias || node.builder.name}`, [], [], ['id']);
+            inlineJobsConfig[createDep.tag.name] = {
                 ResourceJob: {
                     idType: null,
                     output: { raw: modelName },
@@ -188,8 +179,8 @@ class ResourceBuilder extends block_builder_1.BlockBuilder {
         // update
         const updateDep = node.builder._jobs.update;
         if (updateDep) {
-            const defaultTrigger = (0, bucket_model_convert_1.convertToMessage)(module.name, model, updateDep.name, `Update ${node.builder._alias || node.builder.name}`, [], []);
-            inlineJobsConfig[updateDep.name] = {
+            const defaultTrigger = (0, bucket_model_convert_1.convertToMessage)(module.name, model, updateDep.tag.name, `Update ${node.builder._alias || node.builder.name}`, [], []);
+            inlineJobsConfig[updateDep.tag.name] = {
                 ResourceJob: {
                     idType: model.fields.id.type,
                     output: { raw: modelName },
@@ -200,8 +191,8 @@ class ResourceBuilder extends block_builder_1.BlockBuilder {
         // delete
         const deleteDep = node.builder._jobs.delete;
         if (deleteDep) {
-            const defaultTrigger = (0, bucket_model_convert_1.convertToMessage)(module.name, model, deleteDep.name, `Delete ${node.builder._alias || node.builder.name}`, ['id'], []);
-            inlineJobsConfig[deleteDep.name] = {
+            const defaultTrigger = (0, bucket_model_convert_1.convertToMessage)(module.name, model, deleteDep.tag.name, `Delete ${node.builder._alias || node.builder.name}`, ['id'], []);
+            inlineJobsConfig[deleteDep.tag.name] = {
                 ResourceJob: {
                     idType: model.fields.id.type,
                     output: { raw: 'void' },
@@ -209,7 +200,13 @@ class ResourceBuilder extends block_builder_1.BlockBuilder {
                 }
             };
         }
-        node.schema = new resource_schema_1.$Resource(node.builder.module, node.builder.name, node.builder._alias || node.builder.name, node.builder._authn, node.builder._bucket, node.builder._jobs);
+        node.schema = new resource_schema_1.$Resource(node.builder.module, node.builder.name, node.builder._alias || node.builder.name, node.builder._auth, node.builder._bucket.tag, {
+            view: node.builder._jobs.view?.tag,
+            query: node.builder._jobs.query?.tag,
+            create: node.builder._jobs.create?.tag,
+            update: node.builder._jobs.update?.tag,
+            delete: node.builder._jobs.delete?.tag,
+        });
         const jobs = job_builder_1.JobBuilder.buildInlines(node, tree, module, inlineJobsConfig);
         return {
             schema: node.schema,

package/lib/elements/blocks/resource/resource.d.ts

@@ -5,7 +5,7 @@ import { NesoiObj } from "../../../engine/data/obj";
 import { AnyMessage } from "../../entities/message/message";
 import { Module } from "../../../engine/module";
 import { AnyTrxNode, TrxNode } from "../../../engine/transaction/trx_node";
-import { $Dependency } from "../../../engine/dependency";
+import { Tag } from "../../../engine/dependency";
 import { ResourceAssertions } from '../job/internal/resource_job.builder';
 import { $Job } from '../job/job.schema';
 /**
@@ -47,7 +47,7 @@ export declare class Resource<S extends $Space, M extends $Module, $ extends $Re
         obj: any;
         job: $Job;
     }): Promise<void>;
-    static assertThat(trx: AnyTrxNode, bucket: $Dependency, obj: NesoiObj | undefined, type: keyof ResourceAssertions<any>, arg: any): {
+    static assertThat(trx: AnyTrxNode, bucket: Tag, obj: NesoiObj | undefined, type: keyof ResourceAssertions<any>, arg: any): {
         else: (error: string) => Promise<string | true>;
     };
 }

package/lib/elements/blocks/resource/resource.js

@@ -35,28 +35,19 @@ class Resource extends block_1.Block {
         if (!this.schema.jobs.view) {
             throw error_1.NesoiError.Resource.ViewNotSupported(this.schema);
         }
-        return trx.job(this.schema.jobs.view.refName).forward(msg);
+        return trx.job(this.schema.jobs.view.short).forward(msg);
     }
     async query(trx, msg) {
-        // const q = $BucketQuery.parse(msg.query);
-        // const node = trx.bucket(this.schema.bucket.refName).query(msg.view, q);
-        // if (msg.orderBy) {
-        //     node.orderBy(msg.orderBy as keyof NesoiObj, msg.orderDesc ? 'desc' : 'asc');
-        // }
-        // return node.page({
-        //     perPage: msg.perPage,
-        //     page: msg.page
-        // });
         if (!this.schema.jobs.query) {
             throw error_1.NesoiError.Resource.QueryNotSupported(this.schema);
         }
-        return trx.job(this.schema.jobs.query.refName).forward(msg);
+        return trx.job(this.schema.jobs.query.short).forward(msg);
     }
     async create(trx, msg) {
         if (!this.schema.jobs.create) {
             throw error_1.NesoiError.Resource.CreateNotSupported(this.schema);
         }
-        return trx_node_1.TrxNode.jobWithCustomCtx(trx, this.schema.jobs.create.refName, {
+        return trx_node_1.TrxNode.jobWithCustomCtx(trx, this.schema.jobs.create.short, {
             that: (type, arg) => Resource.assertThat(trx, this.schema.bucket, undefined, type, arg)
         }).forward(msg);
     }
@@ -64,8 +55,8 @@ class Resource extends block_1.Block {
         if (!this.schema.jobs.update) {
             throw error_1.NesoiError.Resource.UpdateNotSupported(this.schema);
         }
-        const obj = await trx.bucket(this.schema.bucket.refName).readOneOrFail(msg.id);
-        return trx_node_1.TrxNode.jobWithCustomCtx(trx, this.schema.jobs.update.refName, {
+        const obj = await trx.bucket(this.schema.bucket.short).readOneOrFail(msg.id);
+        return trx_node_1.TrxNode.jobWithCustomCtx(trx, this.schema.jobs.update.short, {
             that: (type, arg) => Resource.assertThat(trx, this.schema.bucket, obj, type, arg),
             obj,
         })
@@ -75,13 +66,14 @@ class Resource extends block_1.Block {
         if (!this.schema.jobs.delete) {
             throw error_1.NesoiError.Resource.DeleteNotSupported(this.schema);
         }
-        const obj = await trx.bucket(this.schema.bucket.refName).readOneOrFail(msg.id);
-        return trx_node_1.TrxNode.jobWithCustomCtx(trx, this.schema.jobs.delete.refName, {
+        const obj = await trx.bucket(this.schema.bucket.short).readOneOrFail(msg.id);
+        return trx_node_1.TrxNode.jobWithCustomCtx(trx, this.schema.jobs.delete.short, {
             that: (type, arg) => Resource.assertThat(trx, this.schema.bucket, obj, type, arg),
             obj,
         })
             .forward(msg);
     }
+    /* Implementations */
     static view($) {
         const scope = $.job.scope;
         return $.msg.id
@@ -118,7 +110,7 @@ class Resource extends block_1.Block {
             else: async (error) => {
                 let out = false;
                 if (type === 'query is empty') {
-                    out = !(await trx.bucket(bucket.refName)
+                    out = !(await trx.bucket(bucket.short)
                         .query(arg)
                         .params(obj)
                         .first());
@@ -127,7 +119,7 @@ class Resource extends block_1.Block {
                     if (!obj)
                         out = true;
                     else {
-                        out = !(await trx.bucket(bucket.refName)
+                        out = !(await trx.bucket(bucket.short)
                             .hasLink(obj.id, arg));
                     }
                 }