@adminide-stack/core 9.2.1-alpha.26 → 9.2.1-alpha.33

package/lib/interfaces/preferences-service.d.ts

@@ -7,7 +7,7 @@ export type IPrefFragment = {
 };
 export interface IPreferencesService {
     initiateSettingsFile(resource: URI): Promise<any>;
-    defaultViewerSettingsSubject(target: ConfigurationTarget): ISettingsSubject;
+    defaultViewerSettingsSubject(target: ConfigurationTarget, options: IPreferencesOpenOptions): ISettingsSubject;
     /**
      * Viewer Settings for an Organization and its resources.
      * @param params

package/lib/utils/cdecodeUri.d.ts

@@ -1,5 +1,5 @@
 import { URI } from '@vscode-alt/monaco-editor/esm/vs/base/common/uri';
-import { ICdecodeUriPathSegment, IAuthorityComponent } from '../interfaces/generated';
+import { ICdecodeUriPathSegment, IAuthorityComponent, ConfigurationTarget } from '../interfaces/generated';
 import { ICdecodeParsedUri } from '../interfaces/generated';
 export declare const generateCdecodeUri: (authority: string | IAuthorityComponent, params: ICdecodeUriPathSegment, query?: {
     [key: string]: string | number;
@@ -24,3 +24,8 @@ export declare const generateCdecodeUri: (authority: string | IAuthorityComponen
  * @returns
  */
 export declare function parseCdecodeUri(uriString: string | URI): ICdecodeParsedUri;
+/**
+ * Decide a ConfigurationTarget based on whether the cdecode URI
+ * includes an organization name, resourceGroup/resourceType, etc.
+ */
+export declare function determineConfigurationTarget(parsedUri: ICdecodeParsedUri): ConfigurationTarget;

package/lib/utils/cdecodeUri.js

@@ -1,5 +1,17 @@
 import {URI}from'@vscode-alt/monaco-editor/esm/vs/base/common/uri.js';import {Schemas}from'@workbench-stack/core/lib/core/network.js';import sortKeys from'sort-keys';import queryString from'query-string';import {IConfigCollectionName}from'../interfaces/generated/generated-models.js';/* eslint-disable prefer-destructuring */
 /* eslint-disable default-param-last */
+/**
+ * Extracts tenantId from the authority string.
+ * Adjust this function based on how tenantId is represented in the authority.
+ * For example, if authority is 'myApp.us-west-2.cdecode.com', tenantId could be 'myApp'.
+ * @param authority - The authority part of the URI.
+ * @returns The extracted tenantId.
+ */
+function extractTenantId(authority) {
+  // Example extraction logic: assuming tenantId is the first subdomain
+  const parts = authority.split('.');
+  return parts[0]; // 'myApp' from 'myApp.us-west-2.cdecode.com'
+}
 const generateCdecodeUri = (authority, params, query = {}, fragment) => {
   let authorityString;
   // Determine if authority is a string or an object
@@ -80,6 +92,7 @@ function parseCdecodeUri(uriString) {
     // Handle the case with no path segments (e.g., `cdecode://us-west-2/`)
     return {
       scheme: uri.scheme,
+      tenantId: extractTenantId(uri.authority),
       authority: uri.authority,
       pathSegments,
       queryData: queryString.parse(uri.query),
@@ -132,8 +145,32 @@ function parseCdecodeUri(uriString) {
   return {
     scheme: uri.scheme,
     authority: uri.authority,
+    tenantId: extractTenantId(uri.authority),
     pathSegments,
     queryData,
     fragmentData
   };
-}export{generateCdecodeUri,parseCdecodeUri};//# sourceMappingURL=cdecodeUri.js.map
+}
+/**
+ * Decide a ConfigurationTarget based on whether the cdecode URI
+ * includes an organization name, resourceGroup/resourceType, etc.
+ */
+function determineConfigurationTarget(parsedUri) {
+  const {
+    organization,
+    resourceType
+  } = parsedUri.pathSegments;
+  // If resourceType is present, it implies ORGANIZATION_RESOURCE
+  if (resourceType) {
+    return 5 /* ConfigurationTarget.ORGANIZATION_RESOURCE */;
+  }
+  // If there's an organization but no resourceType, treat it as ORGANIZATION
+  if (organization) {
+    return 4 /* ConfigurationTarget.ORGANIZATION */;
+  }
+  // Otherwise, no organization => fallback to USER or APPLICATION
+  // You can add logic here to differentiate user vs. application
+  // For example, if you have a special authority or naming convention for applications
+  // For now, default to USER
+  return 1 /* ConfigurationTarget.USER */;
+}export{determineConfigurationTarget,generateCdecodeUri,parseCdecodeUri};//# sourceMappingURL=cdecodeUri.js.map

package/lib/utils/cdecodeUri.js.map

@@ -1 +1 @@
-{"version":3,"file":"cdecodeUri.js","sources":["../../src/utils/cdecodeUri.ts"],"sourcesContent":[null],"names":[],"mappings":"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"}
+{"version":3,"file":"cdecodeUri.js","sources":["../../src/utils/cdecodeUri.ts"],"sourcesContent":[null],"names":[],"mappings":"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"}

package/lib/utils/generate-uri.d.ts

@@ -31,6 +31,8 @@ export declare const generateResourceUri: (collectionName: IConfigCollectionName
     [key: string]: any;
     name?: string;
     orgName: string;
-}, fragment: string, authority?: string) => URI;
-export declare const generateOrgUri: (name: any, fragment: string, authority?: string) => URI;
-export declare const generateMachineUri: (name: any, fragment: string, authority?: string) => URI;
+}, fragment: string, authority?: string, options?: {
+    flatten: boolean;
+}) => URI;
+export declare const generateOrgUri: (name: string, fragment: string, authority?: string) => URI;
+export declare const generateMachineUri: (name: string, fragment: string, authority?: string) => URI;

package/lib/utils/generate-uri.js

@@ -1,4 +1,18 @@
-import {Schemas}from'@workbench-stack/core/lib/core/network.js';import {URI}from'@vscode-alt/monaco-editor/esm/vs/base/common/uri.js';import sortKeys from'sort-keys';import queryString from'query-string';import {IConfigCollectionName,IConfigFragmentName}from'../interfaces/generated/generated-models.js';import'../interfaces/configuration/configuration.js';import'../interfaces/organization/organization-context.js';import'@workbench-stack/core/lib/constants/extensions.js';import'@workbench-stack/core/lib/interfaces/lifecycle/lifecycle.js';import'../interfaces/permissions.js';import {flatten}from'./flatten-utils.js';/**
+import {Schemas}from'@workbench-stack/core/lib/core/network.js';import {URI}from'@vscode-alt/monaco-editor/esm/vs/base/common/uri.js';import sortKeys from'sort-keys';import queryString from'query-string';import {IConfigCollectionName,IConfigFragmentName}from'../interfaces/generated/generated-models.js';import'../interfaces/configuration/configuration.js';import'../interfaces/organization/organization-context.js';import'@workbench-stack/core/lib/constants/extensions.js';import'@workbench-stack/core/lib/interfaces/lifecycle/lifecycle.js';import'../interfaces/permissions.js';import {flatten}from'./flatten-utils.js';function hasNestedObject(obj) {
+  // Not an object or null? No nesting to worry about.
+  if (typeof obj !== 'object' || obj === null) {
+    return false;
+  }
+  // Treat arrays as acceptable—e.g., { alias: ["some"] } is fine.
+  if (Array.isArray(obj)) {
+    return false;
+  }
+  // If any direct property is itself an object (and not an array), we have nesting.
+  // For deeper checks, this could recurse further, but for now we only forbid
+  // direct child objects. E.g. { name: { name: 'tet' } } triggers an error.
+  return Object.values(obj).some(val => typeof val === 'object' && val !== null && !Array.isArray(val));
+}
+/**
  * Generate URI, it sorts the params in order to generate URI.
  * @param collectionName Schema Name to be used
  * @param params Params to use as query
@@ -8,6 +22,10 @@ import {Schemas}from'@workbench-stack/core/lib/core/network.js';import {URI}from
 const generateUri = (collectionName, params, fragment, authority = '', options = {
   flatten: false
 }) => {
+  // If we are NOT flattening, but detect nested objects, throw an error
+  if (!options.flatten && hasNestedObject(params)) {
+    throw new Error(`generateUri: "params: ${JSON.stringify(params)}" contains nested object(s), but "options.flatten" is false. Please flatten your data or enable flatten.`);
+  }
   params = options.flatten ? flatten(params) : params;
   const orderedParams = sortKeys(params);
   const queryString$1 = queryString.stringify(orderedParams);
@@ -40,7 +58,9 @@ const generateUserUri = (params, fragment = IConfigFragmentName.Settings, author
 const generateApplicationUri = (orgName, fragment = IConfigFragmentName.Settings, authority = '') => generateUri(IConfigCollectionName.Organizations, {
   orgName
 }, fragment, authority);
-const generateResourceUri = (collectionName, params, fragment, authority = '') => generateUri(collectionName, params, fragment, authority);
+const generateResourceUri = (collectionName, params, fragment, authority = '', options = {
+  flatten: false
+}) => generateUri(collectionName, params, fragment, authority, options);
 const generateOrgUri = (name, fragment, authority = '') => generateUri(IConfigCollectionName.Organizations, {
   name
 }, fragment, authority);

package/lib/utils/generate-uri.js.map

@@ -1 +1 @@
-{"version":3,"file":"generate-uri.js","sources":["../../src/utils/generate-uri.ts"],"sourcesContent":[null],"names":["queryString","querystring"],"mappings":"4mBAOA;;;;;;AAMG;MACU,WAAW,GAAG,CACvB,cAAqC,EACrC,MAA8B,EAC9B,QAAgB,EAChB,SAAS,GAAG,EAAE,EACd,OAAO,GAAG;AAEV,EAAA,OAAA,EAAS;AACT,CAAA,KAAA;QACM,GAAA,OAAA,CAAA,OAAyB,GAAA,OAAC,WAAU,MAAA;QAEnC,aAAS,GAAI,eAAgB,CAAA;QAChCA,aAAe,GAAAC,WAAY,CAAA,SAAA,CAAA,aAAA,CAAA;SAClB,GAAA,CAAA,IAAA,CAAA,CAAA,CAAA,EAAA,cAAA,CAAA,CAAA,CAAA,CAAA,IAAA,CAAA;UACD,EAAA,OAAA,CAAA,WAAA;AACR,IAAA,SAAK;AACR,IAAA,QAAE;AACP,IAAE,KAAA,EAAAD;AAEF,GAAA,CAAA;;AAEG;AACH;AAMA;;AAEG,EAAA,GAAA,EAAA;AACH,CAAA,EAAA,QAAa,EAAA,SAAA;AAKT;;;AAGC,MAAA,eAAA,GAAA,CAAA,MAAA,EAAA,QAAA,GAAA,mBAAA,CAAA,QAAA,EAAA,SAAA,GAAA,EAAA,KAAA;AACD,EAAA,IAAA,MAAkB,CAAA,SAAA,EAAsB;AAC5C,IAAE,MAAA,CAAA,KAAA,GAAA,CAAA,MAAA,CAAA,SAAA,CAAA;AAEF,IAAA,OAAA,MAAA,CAAA,SAAA;;AAEG,EAAA,OAAA,WAAA,CAAA,qBAAA,CAAA,QAAA,EAAA,MAAA,EAAA,QAAA,EAAA,SAAA,CAAA;AACH;AAGA;AAOA;AAGA;;;;;;;;;;"}
+{"version":3,"file":"generate-uri.js","sources":["../../src/utils/generate-uri.ts"],"sourcesContent":[null],"names":["queryString","querystring"],"mappings":"4mBAOA,SAAS,eAAe,CAAC,GAAQ,EAAA;;MAEzB,OAAA,QAAe,QAAA,OAAe,KAAA,IAAS,EAAA;AACvC,IAAA,OAAA;;;AAGJ,EAAA,IAAA,aAAU,CAAA,GAAW,CAAA,EAAC;AAClB,IAAA,OAAA;;;;;AAKJ,EAAA,OAAA,MAAa,CAAA,MAAO,CAAA,GAAI,CAAA,CAAA,IAAE,CAAA,GAAM,IAAG,OAAK,GAAA,KAAU,QAAa,IAAA,GAAA,KAAO,IAAK,IAAI,CAAI,KAAM,CAAA,OAAQ,CAAA,GAAA,CAAC,CAAG;AACzG;AACA;;;;;;AAMG;MACU,WAAW,GAAG,CACvB,cAAqC,EACrC,MAA8B,EAC9B,QAAgB,EAChB,SAAS,GAAG,EAAE,EACd,OAAO,GAAG;SAE4D,EAAA;MAClE;AACA;MAKH,CAAA,OAAA,CAAA,OAAA,IAAA,eAAA,CAAA,MAAA,CAAA,EAAA;AACD,IAAA,MAAM,IAAG,KAAA,CAAO,CAAC,wBAAwB,IAAI,UAAO,CAAA,MAAA,CAAA,CAAA,wGAAA,CAAA,CAAA;AACpD;QACM,GAAA,OAAA,CAAA,OAAyB,GAAA,OAAC,WAAU,MAAA;QAEnC,aAAS,GAAI,eAAgB,CAAA;QAChCA,aAAe,GAAAC,WAAY,CAAA,SAAA,CAAA,aAAA,CAAA;SAClB,GAAA,CAAA,IAAA,CAAA,CAAA,CAAA,EAAA,cAAA,CAAA,CAAA,CAAA,CAAA,IAAA,CAAA;UACD,EAAA,OAAA,CAAA,WAAA;AACR,IAAA,SAAK;AACR,IAAA,QAAE;AACP,IAAE,KAAA,EAAAD;AAEF,GAAA,CAAA;;AAEG;AACH;AAMA;;AAEG,EAAA,GAAA,EAAA;AACH,CAAA,EAAA,QAAa,EAAA,SAAA;AAKT;;;AAGC,MAAA,eAAA,GAAA,CAAA,MAAA,EAAA,QAAA,GAAA,mBAAA,CAAA,QAAA,EAAA,SAAA,GAAA,EAAA,KAAA;AACD,EAAA,IAAA,MAAkB,CAAA,SAAA,EAAsB;AAC5C,IAAE,MAAA,CAAA,KAAA,GAAA,CAAA,MAAA,CAAA,SAAA,CAAA;AAEF,IAAA,OAAA,MAAA,CAAA,SAAA;;AAEG,EAAA,OAAA,WAAA,CAAA,qBAAA,CAAA,QAAA,EAAA,MAAA,EAAA,QAAA,EAAA,SAAA,CAAA;AACH;AAGA;AAQA;AAGA;;;;;;;;;;;;"}

package/lib/utils/generate-uri.test.d.ts

@@ -0,0 +1 @@
+export {};

package/lib/utils/generated-settings-id.js

@@ -1,7 +1,7 @@
 import {IConfigurationContributionNames}from'../interfaces/generated/generated-models.js';import'../interfaces/configuration/configuration.js';import'../interfaces/organization/organization-context.js';import'@workbench-stack/core/lib/constants/extensions.js';import'@workbench-stack/core/lib/interfaces/lifecycle/lifecycle.js';import'../interfaces/permissions.js';// not used anymore
-const generateSettingsId = (target, nativeId = IConfigurationContributionNames.DefaultSettings) => {
+const generateSettingsId = (target, nativeId = IConfigurationContributionNames.Settings) => {
   if (!nativeId) {
-    nativeId = IConfigurationContributionNames.DefaultSettings;
+    nativeId = IConfigurationContributionNames.Settings;
   }
   return `${nativeId}_${target}`;
 };export{generateSettingsId};//# sourceMappingURL=generated-settings-id.js.map

package/lib/utils/generated-settings-id.js.map

@@ -1 +1 @@
-{"version":3,"file":"generated-settings-id.js","sources":["../../src/utils/generated-settings-id.ts"],"sourcesContent":[null],"names":[],"mappings":"6WAEA;AACO,MAAM,kBAAkB,GAAG,CAC9B,MAA2B,EAC3B,QAAA,GAAmB,+BAA+B,CAAC,eAAe,KAClE;MACI,CAAA,QAAS,EAAA;AACT,IAAA,QAAA,GAAA,+BAAW,CAAA,eAAgC;;AAE/C,EAAA,OAAA,CAAA,EAAU,QAAA,CAAA,CAAQ,EAAI,MAAA,CAAA,CAAM;AAChC"}
+{"version":3,"file":"generated-settings-id.js","sources":["../../src/utils/generated-settings-id.ts"],"sourcesContent":[null],"names":[],"mappings":"6WAEA;AACO,MAAM,kBAAkB,GAAG,CAC9B,MAA2B,EAC3B,QAAA,GAAmB,+BAA+B,CAAC,QAAQ,KAC3D;MACI,CAAA,QAAS,EAAA;AACT,IAAA,QAAA,GAAA,+BAAW,CAAA,QAAgC;;AAE/C,EAAA,OAAA,CAAA,EAAU,QAAA,CAAA,CAAQ,EAAI,MAAA,CAAA,CAAM;AAChC"}

package/lib/utils/index.d.ts

@@ -11,3 +11,5 @@ export * from './date-utils';
 export * from './flatten-utils';
 export * from './generateUserAlias';
 export * from './getLogger';
+export * from './preferenceUri';
+export * from './reviveUri';

package/lib/utils/preferenceUri.d.ts

@@ -0,0 +1,18 @@
+import { URI } from '@vscode-alt/monaco-editor/esm/vs/base/common/uri';
+import { ConfigurationTarget, IPreferencesOpenOptionsInput } from '../interfaces';
+export declare function getOpenSettings(target: ConfigurationTarget, resource: URI, options: IPreferencesOpenOptionsInput): {
+    editableSettingsInput: URI;
+    defaultPreferencesInput: URI;
+};
+/**
+ * Tries to parse the “extension name” from a URI path that might look like:
+ *   /myExtension/settings.json
+ *   /defaultsettings/resourceSettings.json
+ *   /someFolder/myExtension/organizationSettings.json
+ *
+ * If the last path segment is one of the “known” settings files, return
+ * the second-to-last segment as the extension name. Otherwise, return “settings” by default.
+ */
+export declare function parseExtensionFromDefaultSettingsUri(resource: URI): string;
+export declare function getDefaultSettingsURI(target: ConfigurationTarget, options: IPreferencesOpenOptionsInput): URI;
+export declare function getEditableSettingsURI(resource: URI, options?: IPreferencesOpenOptionsInput): URI;

package/lib/utils/preferenceUri.js

@@ -0,0 +1,107 @@
+import {URI}from'@vscode-alt/monaco-editor/esm/vs/base/common/uri.js';import {IConfigurationContributionNames}from'../interfaces/generated/generated-models.js';import'../interfaces/configuration/configuration.js';import'../interfaces/organization/organization-context.js';import'@workbench-stack/core/lib/constants/extensions.js';import'@workbench-stack/core/lib/interfaces/lifecycle/lifecycle.js';import'../interfaces/permissions.js';import {convertToResourceUri}from'./resourceUriConversion.js';const KNOWN_SETTINGS_FILES = new Set(['settings.json', 'organizationSettings.json', 'resourceSettings.json', 'machineSettings.json', 'applicationSettings.json', 'organizationsettings.json', 'resourcesettings.json', 'machinesettings.json', 'applicationsettings.json']);
+function getOpenSettings(target, resource, options) {
+  const editableSettingsResource = getEditableSettingsURI(resource, options);
+  const mergedOptions = {
+    ...options,
+    authority: editableSettingsResource.authority,
+    query: editableSettingsResource.query,
+    // Use editableSettingsResource.fragment if none was explicitly set.
+    defaultFragment: options?.defaultFragment ?? editableSettingsResource.fragment,
+    // Use the provided extensionName, or derive it from the resource’s path
+    extensionName: options?.extensionName ?? parseExtensionFromDefaultSettingsUri(editableSettingsResource)
+  };
+  const defaultPreferencesResource = getDefaultSettingsURI(target, mergedOptions);
+  return {
+    editableSettingsInput: editableSettingsResource,
+    defaultPreferencesInput: defaultPreferencesResource
+  };
+}
+/**
+ * Tries to parse the “extension name” from a URI path that might look like:
+ *   /myExtension/settings.json
+ *   /defaultsettings/resourceSettings.json
+ *   /someFolder/myExtension/organizationSettings.json
+ *
+ * If the last path segment is one of the “known” settings files, return
+ * the second-to-last segment as the extension name. Otherwise, return “settings” by default.
+ */
+function parseExtensionFromDefaultSettingsUri(resource) {
+  const pathSegments = resource.path.split('/').filter(Boolean);
+  if (pathSegments.length === 0) {
+    return 'settings';
+  }
+  const lastSegment = pathSegments[pathSegments.length - 1].toLowerCase();
+  // 1) If the last segment is among the known settings files (ends with .json)
+  if (KNOWN_SETTINGS_FILES.has(lastSegment)) {
+    // We expect the extension name to be the second-to-last segment
+    // e.g. "/myExtension/settings.json" or "/some/folder/ext/organizationSettings.json"
+    if (pathSegments.length >= 2) {
+      return pathSegments[pathSegments.length - 2];
+    }
+    // If there's only one segment overall, fallback
+    return IConfigurationContributionNames.Settings;
+  }
+  // 2) If it still ends with .json but not a standard settings file, just remove ".json"
+  //    and treat that as the extension name. (Optional logic)
+  if (lastSegment.endsWith('.json')) {
+    // e.g. "/myExtension/otherFile.json" → extension = "otherFile" (or 2nd to last segment?)
+    // This snippet assumes you want "otherFile" from the last segment. If you instead want
+    // the second-to-last segment as an “extensionName,” just adjust accordingly.
+    const trimmed = lastSegment.replace(/\.json$/, '');
+    return trimmed || IConfigurationContributionNames.Settings;
+  }
+  // 3) If no recognized .json file, just fallback
+  return IConfigurationContributionNames.Settings;
+}
+function getDefaultSettingsURI(target, options) {
+  const extension = options.extensionName || IConfigurationContributionNames.Settings;
+  switch (target) {
+    case 4 /* ConfigurationTarget.ORGANIZATION */:
+      return URI.from({
+        scheme: 'cdecode',
+        authority: options.authority,
+        path: `/${extension}/organizationSettings.json`,
+        query: options.query,
+        fragment: options.defaultFragment
+      });
+    case 5 /* ConfigurationTarget.ORGANIZATION_RESOURCE */:
+      return URI.from({
+        scheme: 'cdecode',
+        authority: options.authority,
+        path: `/${extension}/resourceSettings.json`,
+        query: options.query,
+        fragment: options.defaultFragment
+      });
+    default:
+      return URI.from({
+        scheme: 'cdecode',
+        authority: options.authority,
+        path: `/${extension}/settings.json`,
+        query: options.query,
+        fragment: options.defaultFragment
+      });
+  }
+}
+function getEditableSettingsURI(resource, options = {
+  forceExist: false
+}) {
+  // Grab the existing or new fragment from options
+  let {
+    fragment
+  } = options;
+  if (options?.subFragment) {
+    // If there’s a subFragment, stitch it into the main fragment
+    fragment = fragment ? fragment.concat(`.${options.subFragment}`) : options.subFragment;
+  }
+  // Fall back to the resource’s existing fragment if neither fragment nor subFragment is provided
+  const finalFragment = fragment ?? resource.fragment;
+  // Create a new URI with the possibly updated fragment
+  const newResource = URI.from({
+    scheme: resource.scheme,
+    path: resource.path,
+    query: resource.query,
+    fragment: finalFragment
+  });
+  // Always convert to resource-based URI
+  return convertToResourceUri(newResource);
+}export{getDefaultSettingsURI,getEditableSettingsURI,getOpenSettings,parseExtensionFromDefaultSettingsUri};//# sourceMappingURL=preferenceUri.js.map

package/lib/utils/preferenceUri.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"preferenceUri.js","sources":["../../src/utils/preferenceUri.ts"],"sourcesContent":[null],"names":[],"mappings":"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"}

package/lib/utils/preferenceUri.test.d.ts

@@ -0,0 +1 @@
+export {};

package/lib/utils/reviveUri.d.ts

@@ -0,0 +1,2 @@
+import { URI, UriComponents } from '@vscode-alt/monaco-editor/esm/vs/base/common/uri';
+export declare function reviveUri(resource: URI | string | UriComponents): URI;

package/lib/utils/reviveUri.js

@@ -0,0 +1,10 @@
+import {URI}from'@vscode-alt/monaco-editor/esm/vs/base/common/uri.js';function reviveUri(resource) {
+  if (resource instanceof URI) {
+    return resource;
+  } else if (typeof resource === 'string') {
+    // default resource
+    return URI.parse(resource);
+  } else if (typeof resource === 'object') {
+    return URI.revive(resource);
+  }
+}export{reviveUri};//# sourceMappingURL=reviveUri.js.map

package/lib/utils/reviveUri.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"reviveUri.js","sources":["../../src/utils/reviveUri.ts"],"sourcesContent":[null],"names":[],"mappings":"sEAEM,SAAU,SAAS,CAAC,QAAsC,EAAA;AAC5D,EAAA,IAAA,QAAY,YAAA,GAAe,EAAA;AACvB,IAAA,OAAA;SACH,IAAA,OAAA,QAAA,KAAA,QAAA,EAAA;AAAM;WACgB,GAAA,CAAA,KAAA,CAAA,QAAA,CAAA;AACnB,GAAA,MAAA,IAAA,OAAW,QAAM,KAAQ,QAAE,EAAA;IAC/B,OAAC,GAAA,CAAA,MAAA,CAAA,QAAA,CAAA;AAAM;AACH"}

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@adminide-stack/core",
-    "version": "9.2.1-alpha.26",
+    "version": "9.2.1-alpha.33",
     "description": "AdminIDE core for higher packages to depend on",
     "license": "ISC",
     "author": "CDMBase LLC",
@@ -34,7 +34,7 @@
     "publishConfig": {
         "access": "public"
     },
-    "gitHead": "ec9acaa9f2f5cfc7fceee2cf93598b8822039905",
+    "gitHead": "6de0ec0442362d49adf1ff406f9b14f9d4f7480a",
     "typescript": {
         "definition": "lib/index.d.ts"
     }