@omnia/tooling-composers 8.0.47-vnext → 8.0.48-dev

package/internal-do-not-import-from-here/ComponentComposer.d.ts

@@ -1,4 +1,4 @@
-import { WebComponentOptions } from "./models";
+import { ElementOptions } from "./models";
 import { CombinableRuleComposer, ICombinableRuleComposer } from "./CombinableRuleComposer";
 import { WebComponentDefinition, OmniaBlock } from '../../fx-models';
 import { ComposerBase, IComposerBase } from './ComposerBase';
@@ -19,7 +19,7 @@ export declare class ComponentComposer extends ComposerBase<IWebComponentCompose
     private ruleComposer;
     constructor(manifestId: string, manifestName?: string);
     withDefinition: (definition: WebComponentDefinition) => this;
-    registerComponent: (componentOptions: WebComponentOptions) => this;
+    registerComponent: (componentOptions: ElementOptions) => this;
     withLoadRules: () => CombinableRuleComposer<IWebComponentComposer>;
     registerOmniaBlock: <P, T extends OmniaBlock<P>>(options?: T) => this;
     private persistCombinedRules;

package/internal-do-not-import-from-here/ComponentRegistry.d.ts

@@ -1,27 +1,27 @@
 import { IClientLoadableManifestProvider, ResourceManifest } from "./LoadableManifestRegistry";
-import { ResourceBuildOptions, WebComponentOptions } from "./models/index";
-import { WebComponentBundleManifest, ClientResolvableLoadRule, WebComponentDefinition, GuidValue } from '../../fx-models';
+import { ResourceBuildOptions, ElementOptions } from "./models/index";
+import { ComponentBundleManifest, ClientResolvableLoadRule, WebComponentDefinition, GuidValue } from '../../fx-models';
 export declare class ComponentRegistration {
-    componentOptions: WebComponentOptions;
+    componentOptions: ElementOptions;
     manifestPath: string;
     manifest: ResourceManifest;
     buildOptions: ResourceBuildOptions;
     definition: WebComponentDefinition;
     extendApiRules: Array<ClientResolvableLoadRule>;
     loadRules: Array<ClientResolvableLoadRule>;
-    constructor(componentOptions: WebComponentOptions, manifestPath: string, manifest: ResourceManifest);
+    constructor(componentOptions: ElementOptions, manifestPath: string, manifest: ResourceManifest);
 }
 export declare class ComponentRegistry implements IClientLoadableManifestProvider {
     private static ComponentRegistrations;
     private static ComponentElements;
-    static registerComponent: (manifest: ResourceManifest, componentOptions: WebComponentOptions) => void;
+    static registerComponent: (manifest: ResourceManifest, componentOptions: ElementOptions) => void;
     static getComponentDefinition: (manifest: ResourceManifest) => WebComponentDefinition;
     static addComponentDefinition: (manifest: ResourceManifest, definition: WebComponentDefinition) => void;
     static addComponentBuildOptions: (manifest: ResourceManifest, buildOptions: ResourceBuildOptions) => void;
     static newCombinedRules: (manifest: ResourceManifest, rules: Array<ClientResolvableLoadRule>) => void;
     static getRegistrations: () => Array<ComponentRegistration>;
     static getComponentRegistrations: () => Array<ComponentRegistration>;
-    getClientLoadableManifests: (currentServiceId: GuidValue) => Array<WebComponentBundleManifest>;
+    getClientLoadableManifests: (currentServiceId: GuidValue) => Array<ComponentBundleManifest>;
     clearState: () => void;
     private static ensureCorrectManifest;
 }

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

@@ -149,11 +149,7 @@ ComponentRegistry.getRegistrations = () => {
     return components;
 };
 ComponentRegistry.getComponentRegistrations = () => {
-    let components = [];
-    for (const wc of ComponentRegistry.ComponentRegistrations.values()) {
-        components.push(wc);
-    }
-    return components;
+    return Array.from(ComponentRegistry.ComponentRegistrations.values());
 };
 ComponentRegistry.ensureCorrectManifest = (manifest) => {
     if (!manifest ||

package/internal-do-not-import-from-here/Composer.d.ts

@@ -1,5 +1,5 @@
 import { IBlockingComposer } from "./BlockingComposer";
-import { ResourcesOptions, WebComponentOptions, ILocalizationComposer, ManifestGroupOptions, LocalizationOptions, ServiceFeatureOption, ServiceAppDefinitionOption, ServiceRoleDefinitionOption } from "./models";
+import { ResourcesOptions, ElementOptions, ILocalizationComposer, ManifestGroupOptions, LocalizationOptions, ServiceFeatureOption, ServiceAppDefinitionOption, ServiceRoleDefinitionOption } from "./models";
 import { IResourcesComposer, IReOpendedResourcesComposer } from "./ResourcesComposer";
 import { IWebComponentComposer } from "./ComponentComposer";
 import { IManifestGroupComposer } from "./ManifestGroupComposer";
@@ -19,7 +19,7 @@ export interface INewManifestComposer extends IRegisterService {
     * Usage: registerWebComponent({...}).*additionalOperations
     * @param componentOptions the options for the webcomponent
     */
-    registerWebComponent: (componentOptions: WebComponentOptions) => IWebComponentComposer;
+    registerElement: (componentOptions: ElementOptions) => IWebComponentComposer;
     /**
     * Registers a new resources manifest
     * Usage: registerResource({...}).*additionalOperations
@@ -33,7 +33,7 @@ export interface INewManifestComposer extends IRegisterService {
     * Usage: registerResourceGroup({...}).*additionalOperations
     * @param groupOptions the options for the defining the webcomponent group.
     */
-    registerResourceGroup: (groupOptions: ManifestGroupOptions) => IManifestGroupComposer;
+    registerResourceGroup: (groupOptions: ManifestGroupOptions<GuidValue>) => IManifestGroupComposer;
     /**
     * Registers a new localization manifest
     * Used to add labels for localization

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

@@ -17,7 +17,7 @@ class NewManifestComposer {
     constructor(manifestId, manifestName) {
         this.manifestId = manifestId;
         this.manifestName = manifestName;
-        this.registerWebComponent = (componentOptions) => {
+        this.registerElement = (componentOptions) => {
             return new ComponentComposer_1.ComponentComposer(this.manifestId, this.manifestName).registerComponent(componentOptions);
         };
         this.registerResourceGroup = (componentGroupOptions) => {

package/internal-do-not-import-from-here/CustomServiceComposer.d.ts

@@ -0,0 +1,11 @@
+import { ServiceOptions } from './models';
+import { IServiceManifestComposer, ServiceManifestComposer } from './ServiceManifestComposer';
+export interface ICustomServiceComposer extends IServiceManifestComposer<ICustomServiceComposer> {
+    runHelm: (cmd: string) => ICustomServiceComposer;
+}
+export declare class CustomServiceComposer extends ServiceManifestComposer<CustomServiceComposer> implements ICustomServiceComposer {
+    private manifestId;
+    private manifestTitle;
+    constructor(manifestId: string, manifestTitle: string, serviceOptions: ServiceOptions);
+    runHelm(cmd: string): this;
+}

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

@@ -0,0 +1,31 @@
+"use strict";
+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");
+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)) {
+            throw new Error("Can't register omnia service with id: " + this.manifestId + " must be a valid Guid");
+        }
+        let serviceInfo = {
+            description: serviceOptions.description,
+            id: manifestId,
+            serviceType: models_1.ServiceTypes.Custom,
+            title: manifestTitle,
+            optionalService: false
+        };
+        ServiceManifestRegistry_1.ServiceManifestRegistry.AddService(serviceInfo);
+    }
+    runHelm(cmd) {
+        ServiceManifestRegistry_1.ServiceManifestRegistry.getServiceInfo().hemlCommand = cmd;
+        return this;
+    }
+}
+exports.CustomServiceComposer = CustomServiceComposer;

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

@@ -12,6 +12,13 @@ class ManifestGroupRegistration {
         this.manifestPath = manifestPath;
         this.manifest = manifest;
         this.loadRules = [];
+        // ensure is string value
+        if (this.manifestGroupOptions.resourceManifestIds) {
+            this.manifestGroupOptions.resourceManifestIds = this.manifestGroupOptions.resourceManifestIds.map(r => r.toString());
+        }
+        if (this.manifestGroupOptions.webComponentManifestIds) {
+            this.manifestGroupOptions.webComponentManifestIds = this.manifestGroupOptions.webComponentManifestIds.map(r => r.toString());
+        }
     }
 }
 exports.ManifestGroupRegistration = ManifestGroupRegistration;

package/internal-do-not-import-from-here/ServiceComposer.d.ts

@@ -1,6 +1,7 @@
 import { ServiceOptions } from './models';
 import { IWebAppServiceComposer } from './WebAppServiceComposer';
 import { IWorkerServiceComposer } from './WorkerServiceComposer';
+import { ICustomServiceComposer } from './CustomServiceComposer';
 export interface IRegisterService {
     /** Specify service type for this omnia service project.
     E.g. A service could be a worker, doing simple async jobs, worker queues etc
@@ -17,6 +18,10 @@ export interface IServiceComposer {
     * Register service to be of type worker
     */
     AsWorker: () => IWorkerServiceComposer;
+    /**
+    * Register service to be of custom type (to install heml)
+    */
+    AsCustom: () => ICustomServiceComposer;
 }
 export declare class ServiceComposer implements IServiceComposer {
     private manifestId;
@@ -25,4 +30,5 @@ export declare class ServiceComposer implements IServiceComposer {
     constructor(manifestId: string, manifestName: string, serviceInfo: ServiceOptions);
     AsWebApp: () => IWebAppServiceComposer;
     AsWorker: () => IWorkerServiceComposer;
+    AsCustom: () => ICustomServiceComposer;
 }

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

@@ -2,8 +2,9 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.ServiceComposer = void 0;
 const Utils_1 = require("./Utils");
-const WorkerServiceComposer_1 = require("./WorkerServiceComposer");
 const WebAppServiceComposer_1 = require("./WebAppServiceComposer");
+const WorkerServiceComposer_1 = require("./WorkerServiceComposer");
+const CustomServiceComposer_1 = require("./CustomServiceComposer");
 class ServiceComposer {
     constructor(manifestId, manifestName, serviceInfo) {
         // TODO wait hot reload update not execute composer two times
@@ -16,6 +17,9 @@ class ServiceComposer {
         this.AsWorker = () => {
             return new WorkerServiceComposer_1.WorkerServiceComposer(this.manifestId, this.manifestName, this.serviceInfo);
         };
+        this.AsCustom = () => {
+            return new CustomServiceComposer_1.CustomServiceComposer(this.manifestId, this.manifestName, this.serviceInfo);
+        };
         if (!Utils_1.Utils.isValidGuid(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/ServiceManifestRegistry.js

@@ -8,7 +8,8 @@ class ServiceManifestRegistry {
 ServiceManifestRegistry.Service = null;
 ServiceManifestRegistry.AddService = (service) => {
     if (!(service.serviceType === index_1.ServiceTypes.WebApp ||
-        service.serviceType === index_1.ServiceTypes.Worker)) {
+        service.serviceType === index_1.ServiceTypes.Worker ||
+        service.serviceType === index_1.ServiceTypes.Custom)) {
         throw new Error("Unknown service type: " + JSON.stringify(service));
     }
     if (ServiceManifestRegistry.Service) {

package/internal-do-not-import-from-here/index.d.ts

@@ -20,4 +20,5 @@ export * from './BuildConfigurationRegistry';
 export * from './ServiceManifestRegistry';
 export * from './ImportManifestRegistry';
 export * from "./ConfigurationClientServiceRegistry";
-export { type BuildOptions, ServiceTypes } from "./models/index";
+export { type BuildOptions, ServiceTypes, type ElementOptions as WebComponentOptions } from "./models/index";
+export * from "./CustomServiceComposer";

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

@@ -26,5 +26,6 @@ tslib_1.__exportStar(require("./ImportManifestRegistry"), exports);
 tslib_1.__exportStar(require("./ConfigurationClientServiceRegistry"), exports);
 var index_1 = require("./models/index");
 Object.defineProperty(exports, "ServiceTypes", { enumerable: true, get: function () { return index_1.ServiceTypes; } });
+tslib_1.__exportStar(require("./CustomServiceComposer"), exports);
 const models_1 = require("../../fx-models");
 var ignore = models_1.AuthenticationValidationStatuses;

package/internal-do-not-import-from-here/models/Build.d.ts

@@ -49,7 +49,11 @@ export interface BuildOptions {
     /**
     * Create dynamic documentaion with manifest id.
     */
-    dynamicDocManifestId?: GuidValue;
+    docResourceManifestId?: GuidValue;
+    /**
+    * Create a namespace to web component tag
+    */
+    webComponentNamespace?: string;
 }
 export interface CircularDependencyOptions {
     /**

package/internal-do-not-import-from-here/models/ComponentComposer.d.ts

@@ -1,4 +1,4 @@
-export interface WebComponentOptions {
+export interface ElementOptions {
     /** The name for this component, this should be a none conflicting name
         e.g. use project as prefix myuniqueprojectname-componentName.
         i.e. <myuniqueprojectname-componentName></myuniqueprojectname-componentName> */

package/internal-do-not-import-from-here/models/Enums.d.ts

@@ -5,7 +5,8 @@ export declare enum RequestedResourceTypes {
 }
 export declare enum ServiceTypes {
     WebApp = "WebAppService",
-    Worker = "WorkerService"
+    Worker = "WorkerService",
+    Custom = "CustomService"
 }
 export declare enum SecurityProviderTypes {
     RoleBased = "RoleBasedProvider",
@@ -33,7 +34,8 @@ export declare enum ServerManifestTypes {
     ServiceFeature = "servicefeature",
     ServiceAppDefinition = "serviceappdefinition",
     AzureADAppPermission = "azureadapppermission",
-    ServiceRoleDefinition = "serviceroledefinition"
+    ServiceRoleDefinition = "serviceroledefinition",
+    HemlProvider = "hemlprovider"
 }
 export declare enum BundleTargetTypes {
     Javascript = "js",

package/internal-do-not-import-from-here/models/Enums.js

@@ -11,6 +11,7 @@ var ServiceTypes;
 (function (ServiceTypes) {
     ServiceTypes["WebApp"] = "WebAppService";
     ServiceTypes["Worker"] = "WorkerService";
+    ServiceTypes["Custom"] = "CustomService";
 })(ServiceTypes = exports.ServiceTypes || (exports.ServiceTypes = {}));
 var SecurityProviderTypes;
 (function (SecurityProviderTypes) {
@@ -44,6 +45,7 @@ var ServerManifestTypes;
     ServerManifestTypes["ServiceAppDefinition"] = "serviceappdefinition";
     ServerManifestTypes["AzureADAppPermission"] = "azureadapppermission";
     ServerManifestTypes["ServiceRoleDefinition"] = "serviceroledefinition";
+    ServerManifestTypes["HemlProvider"] = "hemlprovider";
 })(ServerManifestTypes = exports.ServerManifestTypes || (exports.ServerManifestTypes = {}));
 var BundleTargetTypes;
 (function (BundleTargetTypes) {

package/internal-do-not-import-from-here/models/ManifestGroupComposer.d.ts

@@ -1,6 +1,7 @@
-export interface ManifestGroupOptions {
+import { GuidValue } from "@omnia/fx-models";
+export interface ManifestGroupOptions<T extends string | GuidValue = string> {
     /** The manifest id's of the webcomponent's to include in this group */
-    webComponentManifestIds?: Array<string>;
+    webComponentManifestIds?: Array<T>;
     /** The manifest id's of the resources to include in this group */
-    resourceManifestIds?: Array<string>;
+    resourceManifestIds?: Array<T>;
 }

package/internal-do-not-import-from-here/models/ServerManifests.d.ts

@@ -4,7 +4,7 @@ import { IIcon } from '../../../fx-models/Icon';
 import { ServiceParam } from '../../../fx-models/ServiceParam';
 import { FeatureUIOption, IFeatureConfiguration } from '../../../fx-models/Feature';
 import { GuidValue } from "@omnia/fx-models";
-import { OmniaBackendRuntimes, OmniaRoleTypes } from "../../../fx-models/Enums";
+import { OmniaBackendRuntimes, OmniaRoleTypes, PersistentDiskTypes } from "../../../fx-models/Enums";
 import { AzureAdAppPermissionInfo, AzureAdAppResourceAccessWithAlternate } from "../../../fx-models/AzureAdAppPermissions";
 import { AzureAdAppPermissionOption } from "../AzureAdAppPermissionHelper";
 export interface ServiceFeatureOption {
@@ -98,6 +98,7 @@ export interface AppResourceType {
     icon: IIcon;
     parameters: Array<ServiceParam>;
     providedParameters: Array<ServiceParam>;
+    requiredFeatures?: Array<GuidValue>;
 }
 export interface ServiceAppDefinitionOption {
     title: string;
@@ -159,6 +160,7 @@ export interface ResourceOptionBase {
 export interface SqlResourceOption extends ResourceOptionBase {
 }
 export interface PersistentDiskResourceOption extends ResourceOptionBase {
+    type?: PersistentDiskTypes;
 }
 export interface SqlElasticPoolResourceOption extends ResourceOptionBase {
     elasticPoolId: GuidValue;
@@ -216,6 +218,9 @@ export interface ServiceBase extends ServiceOptions {
     serviceType: ServiceTypes;
     optionalService: boolean;
 }
+export interface CustomService extends ServiceBase {
+    hemlCommand?: string;
+}
 export interface ServiceManifest extends ServiceBase, ServerManifest {
 }
 export interface SecurityProviderIdentity {

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

@@ -149,6 +149,16 @@ function build(scanFolders, cleanOutputBeforeBuild) {
                 if (!DevelopmentBuildConfiguration_1.DevelopmentBuildConfiguration.isEnableBuild) {
                     resolve();
                 }
+                else if (process.argv.length > 0
+                    && process.argv.find(argv => argv === "--package") !== undefined) {
+                    cleanOutput = false;
+                    afterScanManifest()
+                        .then(beforeBundleManifest, chainError)
+                        .then(resolve, reject)
+                        .catch((err) => {
+                        reject(err);
+                    });
+                }
                 else if (process.argv.length > 0
                     && process.argv.find(argv => argv === "--manifestOnly") !== undefined
                     && (process.argv.find(argv => argv === "--force") !== undefined

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@omnia/tooling-composers",
   "license": "MIT",
-  "version": "8.0.47-vnext",
+  "version": "8.0.48-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.47-vnext",
-    "@omnia/tooling": "8.0.47-vnext",
+    "@omnia/fx-models": "8.0.48-dev",
+    "@omnia/tooling": "8.0.48-dev",
     "deep-extend": "0.6.0",
     "fs-extra": "11.1.0",
     "del": "6.0.0",