@omnia/tooling-composers 8.0.179-dev → 8.0.181-dev

package/internal-do-not-import-from-here/CombinableSecurityProviderComposer.js

@@ -2,7 +2,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.SecurityProviderCombinableRuleComposer = void 0;
 const Enums_1 = require("./models/Enums");
-const Utils_1 = require("./Utils");
+const fx_models_1 = require("@omnia/fx-models");
 class SecurityProviderCombinableRuleComposer {
     constructor(newRuleCb, composerForDone) {
         this.newRuleCb = newRuleCb;
@@ -17,7 +17,7 @@ class SecurityProviderCombinableRuleComposer {
             if (!securityProviderId) {
                 throw new Error("Can't add security provider rule with id null/empty/undefined");
             }
-            if (!Utils_1.Utils.isValidGuid(securityProviderId)) {
+            if (!fx_models_1.Guid.isValid(securityProviderId)) {
                 throw new Error("Can't add security provider rule with id: " + securityProviderId + " must be a valid Guid");
             }
             if (this.selectedLogicalOperator == null &&

package/internal-do-not-import-from-here/CustomServiceComposer.js

@@ -2,16 +2,16 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.CustomServiceComposer = void 0;
 const models_1 = require("./models");
-const Utils_1 = require("./Utils");
 const ServiceManifestRegistry_1 = require("./ServiceManifestRegistry");
 const ServiceManifestComposer_1 = require("./ServiceManifestComposer");
+const fx_models_1 = require("@omnia/fx-models");
 class CustomServiceComposer extends ServiceManifestComposer_1.ServiceManifestComposer {
     constructor(manifestId, manifestTitle, serviceOptions) {
         // TODO wait hot reload update not execute composer two times
         super(() => { return this; });
         this.manifestId = manifestId;
         this.manifestTitle = manifestTitle;
-        if (!Utils_1.Utils.isValidGuid(this.manifestId)) {
+        if (!fx_models_1.Guid.isValid(this.manifestId)) {
             throw new Error("Can't register omnia service with id: " + this.manifestId + " must be a valid Guid");
         }
         let serviceInfo = {

package/internal-do-not-import-from-here/ServiceComposer.js

@@ -1,10 +1,10 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.ServiceComposer = void 0;
-const Utils_1 = require("./Utils");
 const WebAppServiceComposer_1 = require("./WebAppServiceComposer");
 const WorkerServiceComposer_1 = require("./WorkerServiceComposer");
 const CustomServiceComposer_1 = require("./CustomServiceComposer");
+const fx_models_1 = require("@omnia/fx-models");
 class ServiceComposer {
     constructor(manifestId, manifestName, serviceInfo) {
         // TODO wait hot reload update not execute composer two times
@@ -20,7 +20,7 @@ class ServiceComposer {
         this.AsCustom = () => {
             return new CustomServiceComposer_1.CustomServiceComposer(this.manifestId, this.manifestName, this.serviceInfo);
         };
-        if (!Utils_1.Utils.isValidGuid(this.manifestId)) {
+        if (!fx_models_1.Guid.isValid(this.manifestId)) {
             throw new Error("Can't register service with id: " + this.manifestId + " must be a valid Guid");
         }
     }

package/internal-do-not-import-from-here/Utils.js

@@ -1,13 +1,14 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.Utils = void 0;
+const models_1 = require("../../fx-models");
 //import { LoadByUrlMatchingRule, DomMatchingRule, ClientResolvableLoadRule, FeatureActiveRule, LoadIfManifestLoaded } from "./models";
 class Utils {
     static { this.ensureValidManifestId = (id, errorMsg) => {
         if (!id) {
             throw new Error(errorMsg ? errorMsg : "Invalid manifest id, can't be null/empty or undefined");
         }
-        if (!Utils.isValidGuid(id.toString())) {
+        if (!models_1.Guid.isValid(id.toString())) {
             console.dir(id);
             throw new Error("The manifest id must be a valid guid");
         }

package/internal-do-not-import-from-here/WebAppServiceComposer.js

@@ -2,7 +2,6 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.WebAppServiceComposer = void 0;
 const models_1 = require("./models");
-const Utils_1 = require("./Utils");
 const CombinableSecurityProviderComposer_1 = require("./CombinableSecurityProviderComposer");
 const SecurityProviderManifestRegistry_1 = require("./SecurityProviderManifestRegistry");
 const ServiceManifestRegistry_1 = require("./ServiceManifestRegistry");
@@ -32,7 +31,7 @@ class WebAppServiceComposer extends ServiceManifestComposer_1.ServiceManifestCom
             if (!validScope) {
                 throw new Error("Can't add role based security provider with scope: " + options.scope + " it's not a valid scope value");
             }
-            if (!Utils_1.Utils.isValidGuid(options.providerId)) {
+            if (!models_2.Guid.isValid(options.providerId)) {
                 throw new Error("Can't add role based security provider with id: " + options.providerId + " must be a valid Guid");
             }
             if (!options.roleName) {
@@ -51,7 +50,7 @@ class WebAppServiceComposer extends ServiceManifestComposer_1.ServiceManifestCom
             if (!options) {
                 throw new Error("Can't add combined security provider with missing options");
             }
-            if (!Utils_1.Utils.isValidGuid(options.providerId)) {
+            if (!models_2.Guid.isValid(options.providerId)) {
                 throw new Error("Can't add combined security provider with id: " + options.providerId + " must be a valid Guid");
             }
             let combinedProvider = {
@@ -65,7 +64,7 @@ class WebAppServiceComposer extends ServiceManifestComposer_1.ServiceManifestCom
             SecurityProviderManifestRegistry_1.SecurityProviderManifestRegistry.AddSecurityProvider(combinedProvider);
             return new CombinableSecurityProviderComposer_1.SecurityProviderCombinableRuleComposer(cbNewRule, this);
         };
-        if (!Utils_1.Utils.isValidGuid(this.manifestId)) {
+        if (!models_2.Guid.isValid(this.manifestId)) {
             throw new Error("Can't register omnia service with id: " + this.manifestId + " must be a valid Guid");
         }
         let serviceInfo = {

package/internal-do-not-import-from-here/WorkerServiceComposer.js

@@ -2,16 +2,16 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.WorkerServiceComposer = void 0;
 const models_1 = require("./models");
-const Utils_1 = require("./Utils");
 const ServiceManifestRegistry_1 = require("./ServiceManifestRegistry");
 const ServiceManifestComposer_1 = require("./ServiceManifestComposer");
+const fx_models_1 = require("@omnia/fx-models");
 class WorkerServiceComposer extends ServiceManifestComposer_1.ServiceManifestComposer {
     constructor(manifestId, manifestTitle, serviceOptions) {
         // TODO wait hot reload update not execute composer two times
         super(() => { return this; });
         this.manifestId = manifestId;
         this.manifestTitle = manifestTitle;
-        if (!Utils_1.Utils.isValidGuid(this.manifestId)) {
+        if (!fx_models_1.Guid.isValid(this.manifestId)) {
             throw new Error("Can't register omnia service with id: " + this.manifestId + " must be a valid Guid");
         }
         let serviceInfo = {

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@omnia/tooling-composers",
   "license": "MIT",
-  "version": "8.0.179-dev",
+  "version": "8.0.181-dev",
   "description": "Provide tooling to work with manifest things.",
   "scripts": {
     "test": "echo \"Error: no test specified\" && exit 1"
@@ -19,8 +19,8 @@
   ],
   "author": "Precio Fishbone",
   "dependencies": {
-    "@omnia/fx-models": "8.0.179-dev",
-    "@omnia/tooling": "8.0.179-dev",
+    "@omnia/fx-models": "8.0.181-dev",
+    "@omnia/tooling": "8.0.181-dev",
     "deep-extend": "0.6.0",
     "fs-extra": "11.1.0",
     "del": "6.0.0",