@azure/iot-modelsrepository 1.0.0-alpha.20250619.1 → 1.0.0-alpha.20250718.2

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (48) hide show
  1. package/dist/browser/dtmiResolver.js +1 -0
  2. package/dist/browser/dtmiResolver.js.map +1 -1
  3. package/dist/browser/fetcherHTTP.js +4 -3
  4. package/dist/browser/fetcherHTTP.js.map +1 -1
  5. package/dist/browser/modelsRepositoryClient.js +15 -7
  6. package/dist/browser/modelsRepositoryClient.js.map +1 -1
  7. package/dist/browser/modelsRepositoryServiceClient.js +6 -1
  8. package/dist/browser/modelsRepositoryServiceClient.js.map +1 -1
  9. package/dist/browser/psuedoParser.js +1 -0
  10. package/dist/browser/psuedoParser.js.map +1 -1
  11. package/dist/commonjs/dtmiResolver.js +1 -0
  12. package/dist/commonjs/dtmiResolver.js.map +1 -1
  13. package/dist/commonjs/fetcherFilesystem.js +4 -3
  14. package/dist/commonjs/fetcherFilesystem.js.map +1 -1
  15. package/dist/commonjs/fetcherHTTP.js +4 -3
  16. package/dist/commonjs/fetcherHTTP.js.map +1 -1
  17. package/dist/commonjs/modelsRepositoryClient.js +15 -7
  18. package/dist/commonjs/modelsRepositoryClient.js.map +1 -1
  19. package/dist/commonjs/modelsRepositoryServiceClient.js +6 -1
  20. package/dist/commonjs/modelsRepositoryServiceClient.js.map +1 -1
  21. package/dist/commonjs/psuedoParser.js +1 -0
  22. package/dist/commonjs/psuedoParser.js.map +1 -1
  23. package/dist/commonjs/tsdoc-metadata.json +11 -11
  24. package/dist/esm/dtmiResolver.js +1 -0
  25. package/dist/esm/dtmiResolver.js.map +1 -1
  26. package/dist/esm/fetcherFilesystem.js +3 -2
  27. package/dist/esm/fetcherFilesystem.js.map +1 -1
  28. package/dist/esm/fetcherHTTP.js +4 -3
  29. package/dist/esm/fetcherHTTP.js.map +1 -1
  30. package/dist/esm/modelsRepositoryClient.js +15 -7
  31. package/dist/esm/modelsRepositoryClient.js.map +1 -1
  32. package/dist/esm/modelsRepositoryServiceClient.js +6 -1
  33. package/dist/esm/modelsRepositoryServiceClient.js.map +1 -1
  34. package/dist/esm/psuedoParser.js +1 -0
  35. package/dist/esm/psuedoParser.js.map +1 -1
  36. package/dist/react-native/dtmiResolver.js +1 -0
  37. package/dist/react-native/dtmiResolver.js.map +1 -1
  38. package/dist/react-native/fetcherFilesystem.js +3 -2
  39. package/dist/react-native/fetcherFilesystem.js.map +1 -1
  40. package/dist/react-native/fetcherHTTP.js +4 -3
  41. package/dist/react-native/fetcherHTTP.js.map +1 -1
  42. package/dist/react-native/modelsRepositoryClient.js +15 -7
  43. package/dist/react-native/modelsRepositoryClient.js.map +1 -1
  44. package/dist/react-native/modelsRepositoryServiceClient.js +6 -1
  45. package/dist/react-native/modelsRepositoryServiceClient.js.map +1 -1
  46. package/dist/react-native/psuedoParser.js +1 -0
  47. package/dist/react-native/psuedoParser.js.map +1 -1
  48. package/package.json +2 -2
@@ -1 +1 @@
1
- {"version":3,"file":"modelsRepositoryClient.js","sourceRoot":"","sources":["../../src/modelsRepositoryClient.ts"],"names":[],"mappings":"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","sourcesContent":["// Copyright (c) Microsoft Corporation.\n// Licensed under the MIT License.\n\nimport {\n DEFAULT_API_VERSION,\n DEFAULT_REPOSITORY_LOCATION,\n DEFAULT_USER_AGENT,\n DEPENDENCY_MODE_DISABLED,\n DEPENDENCY_MODE_ENABLED,\n DEPENDENCY_MODE_TRY_FROM_EXPANDED,\n} from \"./utils/constants.js\";\nimport type { InternalClientPipelineOptions } from \"@azure/core-client\";\nimport { createClientPipeline } from \"@azure/core-client\";\nimport type { Fetcher } from \"./fetcherAbstract.js\";\nimport { isLocalPath, normalize } from \"./utils/path.js\";\nimport { FilesystemFetcher } from \"./fetcherFilesystem.js\";\nimport type { dependencyResolutionType } from \"./dependencyResolutionType.js\";\nimport { DtmiResolver } from \"./dtmiResolver.js\";\nimport { PseudoParser } from \"./psuedoParser.js\";\nimport type { ModelsRepositoryClientOptions } from \"./interfaces/modelsRepositoryClientOptions.js\";\nimport { logger } from \"./logger.js\";\nimport { IoTModelsRepositoryServiceClient } from \"./modelsRepositoryServiceClient.js\";\nimport { HttpFetcher } from \"./fetcherHTTP.js\";\nimport type { GetModelsOptions } from \"./interfaces/getModelsOptions.js\";\nimport type { DTDL } from \"./psuedoDtdl.js\";\n\n/**\n * Initializes a new instance of the IoT Models Repository Client.\n */\nexport class ModelsRepositoryClient {\n private _repositoryLocation: string;\n private _dependencyResolution: dependencyResolutionType;\n private _apiVersion: string;\n private _fetcher: Fetcher;\n private _resolver: DtmiResolver;\n private _pseudoParser: PseudoParser;\n\n /**\n * The ModelsRepositoryClient constructor\n * @param options - The models repository client options that govern the behavior of the client.\n */\n constructor(options: ModelsRepositoryClientOptions = {}) {\n this._repositoryLocation = options.repositoryLocation || DEFAULT_REPOSITORY_LOCATION;\n logger.info(`Client configured for repository location ${this._repositoryLocation}`);\n this._dependencyResolution =\n options.dependencyResolution ||\n this._checkDefaultDependencyResolution(!!options.repositoryLocation);\n logger.info(`Client configured for dependency mode: ${this._dependencyResolution}`);\n this._fetcher = this._createFetcher(this._repositoryLocation, options);\n this._resolver = new DtmiResolver(this._fetcher);\n this._pseudoParser = new PseudoParser(this._resolver);\n\n // Store api version here (for now). Currently doesn't do anything\n this._apiVersion = options.apiVersion || DEFAULT_API_VERSION;\n }\n\n /**\n * improves the readability of the constructor.\n * based on a boolean returns the proper dependency resolution setting string.\n */\n private _checkDefaultDependencyResolution(customRepository: boolean): dependencyResolutionType {\n if (customRepository) {\n return \"enabled\";\n } else {\n return \"tryFromExpanded\";\n }\n }\n\n /**\n * Though currently not relevant, can specify API Version for communicating with\n * the service.\n */\n get apiVersion(): string {\n return this._apiVersion;\n }\n\n /**\n * Configured repository location for this instance. Will be used as the endpoint to get the models from.\n */\n get repositoryLocation(): string {\n return this._repositoryLocation;\n }\n\n /**\n * Configured type of dependency resolution for this instance. Dictates how the client deals with model dependencies.\n */\n get dependencyResolution(): dependencyResolutionType {\n return this._dependencyResolution;\n }\n\n /**\n * Because of the local / remote optionality of this client, the service client\n * must be dynamically generated based on the repository location. If the provided\n * repository location is a remote location, then this private method will be used\n * to create the IoT Models Repository Service Client.\n */\n private _createClient(options: ModelsRepositoryClientOptions): IoTModelsRepositoryServiceClient {\n const { ...pipelineOptions } = options;\n\n if (!pipelineOptions.userAgentOptions) {\n pipelineOptions.userAgentOptions = {};\n }\n if (pipelineOptions.userAgentOptions.userAgentPrefix) {\n pipelineOptions.userAgentOptions.userAgentPrefix = `${pipelineOptions.userAgentOptions.userAgentPrefix} ${DEFAULT_USER_AGENT}`;\n } else {\n pipelineOptions.userAgentOptions.userAgentPrefix = DEFAULT_USER_AGENT;\n }\n\n const internalPipelineOptions: InternalClientPipelineOptions = {\n ...pipelineOptions,\n ...{\n loggingOptions: {\n logger: logger.info,\n },\n },\n };\n\n const pipeline = createClientPipeline(internalPipelineOptions);\n const client = new IoTModelsRepositoryServiceClient(this._repositoryLocation, { pipeline });\n return client;\n }\n\n /**\n * The fetcher is an abstraction necessary since this client can communicate with remote or local\n * Model Repositories based on the provided location. It will analyze the provided location based\n * on that create either an HTTP Fetcher, which uses the IoT Models Repository Service Client,\n * or a Filesystem Fetcher.\n */\n private _createFetcher(location: string, options: ModelsRepositoryClientOptions): Fetcher {\n let locationURL;\n let fetcher;\n if (isLocalPath(location)) {\n // POSIX Filesystem Path or Windows Filesystem Path\n logger.info(`Repository location identified as filesystem path - using FilesystemFetcher`);\n fetcher = new FilesystemFetcher(normalize(location));\n } else {\n locationURL = new URL(location);\n const prot = locationURL.protocol;\n if (prot.includes(\"http\") || prot.includes(\"https\")) {\n logger.info(`Repository location identified as HTTP/HTTPS endpoint - using HttpFetcher`);\n const client = this._createClient(options);\n fetcher = new HttpFetcher(location, client);\n } else if (prot.includes(\"file\")) {\n // filesystem URI\n logger.info(\"Repository Location identified as filesystem URI - using FilesystemFetcher\");\n fetcher = new FilesystemFetcher(location);\n } else if (prot === \"\" && location.search(/\\.[a-zA-Z]{2,63}$/)) {\n // Web URL with protocol unspecified - default to HTTPS\n logger.info(\n \"Repository Location identified as remote endpoint without protocol specified - using HttpFetcher\",\n );\n const fLocation = \"https://\" + location;\n const client = this._createClient(options);\n fetcher = new HttpFetcher(fLocation, client);\n } else {\n throw new EvalError(`Unable to identify location: ${location}`);\n }\n }\n\n return fetcher;\n }\n\n /**\n * Retrieve one or more models based upon on or more provided dtmis.\n * @param dtmis - one dtmi represented as a string\n * @param options - options to govern behavior of model getter.\n */\n async getModels(dtmis: string, options?: GetModelsOptions): Promise<{ [dtmi: string]: unknown }>;\n /**\n * Retrieve one or more models based upon on or more provided dtmis.\n * @param dtmis - dtmi strings in an array.\n * @param options - options to govern behavior of model getter.\n */\n async getModels(\n dtmis: string[],\n options?: GetModelsOptions,\n ): Promise<{ [dtmi: string]: unknown }>;\n async getModels(\n dtmis: string | string[],\n options?: GetModelsOptions,\n ): Promise<{ [dtmi: string]: unknown }> {\n let modelMap: { [dtmi: string]: unknown };\n if (!Array.isArray(dtmis)) {\n dtmis = [dtmis];\n }\n\n const dependencyResolution = options?.dependencyResolution || this._dependencyResolution;\n\n if (dependencyResolution === DEPENDENCY_MODE_DISABLED) {\n logger.info(\"Getting models w/ dependency resolution mode: disabled\");\n logger.info(`Retreiving model(s): ${dtmis}...`);\n modelMap = await this._resolver.resolve(dtmis, false, options);\n } else if (dependencyResolution === DEPENDENCY_MODE_ENABLED) {\n logger.info(`Getting models w/ dependency resolution mode: enabled`);\n logger.info(`Retreiving model(s): ${dtmis}...`);\n const baseModelMap = await this._resolver.resolve(dtmis, false, options);\n const baseModelList = Object.keys(baseModelMap).map((key) => baseModelMap[key]);\n logger.info(`Retreiving model dependencies for ${dtmis}...`);\n modelMap = await this._pseudoParser.expand(baseModelList, false);\n } else if (dependencyResolution === DEPENDENCY_MODE_TRY_FROM_EXPANDED) {\n logger.info(`Getting models w/ dependency resolution mode: tryFromExpanded`);\n try {\n logger.info(`Retreiving expanded model(s): ${dtmis}...`);\n modelMap = await this._resolver.resolve(dtmis, true, options);\n } catch (e: any) {\n if (e.name === \"RestError\" && e.code === \"ResouceNotFound\") {\n logger.info(\"Could not retrieve model(s) from expanded model DTDL - \");\n const baseModelMap: { [dtmi: string]: unknown } = await this._resolver.resolve(\n dtmis,\n false,\n options,\n );\n const baseModelList = Object.keys(baseModelMap).map((key) => baseModelMap[key]);\n logger.info(`Retreiving model dependencies for ${dtmis}...`);\n modelMap = await this._pseudoParser.expand(baseModelList as DTDL[], true);\n } else {\n throw e;\n }\n }\n } else {\n throw EvalError(`Invalid dependency resolution mode: ${dependencyResolution}`);\n }\n\n return modelMap;\n }\n}\n"]}
1
+ {"version":3,"file":"modelsRepositoryClient.js","sourceRoot":"","sources":["../../src/modelsRepositoryClient.ts"],"names":[],"mappings":"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","sourcesContent":["// Copyright (c) Microsoft Corporation.\n// Licensed under the MIT License.\n\nimport {\n DEFAULT_API_VERSION,\n DEFAULT_REPOSITORY_LOCATION,\n DEFAULT_USER_AGENT,\n DEPENDENCY_MODE_DISABLED,\n DEPENDENCY_MODE_ENABLED,\n DEPENDENCY_MODE_TRY_FROM_EXPANDED,\n} from \"./utils/constants.js\";\nimport type { InternalClientPipelineOptions } from \"@azure/core-client\";\nimport { createClientPipeline } from \"@azure/core-client\";\nimport type { Fetcher } from \"./fetcherAbstract.js\";\nimport { isLocalPath, normalize } from \"./utils/path.js\";\nimport { FilesystemFetcher } from \"./fetcherFilesystem.js\";\nimport type { dependencyResolutionType } from \"./dependencyResolutionType.js\";\nimport { DtmiResolver } from \"./dtmiResolver.js\";\nimport { PseudoParser } from \"./psuedoParser.js\";\nimport type { ModelsRepositoryClientOptions } from \"./interfaces/modelsRepositoryClientOptions.js\";\nimport { logger } from \"./logger.js\";\nimport { IoTModelsRepositoryServiceClient } from \"./modelsRepositoryServiceClient.js\";\nimport { HttpFetcher } from \"./fetcherHTTP.js\";\nimport type { GetModelsOptions } from \"./interfaces/getModelsOptions.js\";\nimport type { DTDL } from \"./psuedoDtdl.js\";\n\n/**\n * Initializes a new instance of the IoT Models Repository Client.\n */\nexport class ModelsRepositoryClient {\n private _repositoryLocation: string;\n private _dependencyResolution: dependencyResolutionType;\n private _apiVersion: string;\n private _fetcher: Fetcher;\n private _resolver: DtmiResolver;\n private _pseudoParser: PseudoParser;\n\n /**\n * The ModelsRepositoryClient constructor\n * @param options - The models repository client options that govern the behavior of the client.\n */\n constructor(options: ModelsRepositoryClientOptions = {}) {\n this._repositoryLocation = options.repositoryLocation || DEFAULT_REPOSITORY_LOCATION;\n logger.info(`Client configured for repository location ${this._repositoryLocation}`);\n this._dependencyResolution =\n options.dependencyResolution ||\n this._checkDefaultDependencyResolution(!!options.repositoryLocation);\n logger.info(`Client configured for dependency mode: ${this._dependencyResolution}`);\n this._fetcher = this._createFetcher(this._repositoryLocation, options);\n this._resolver = new DtmiResolver(this._fetcher);\n this._pseudoParser = new PseudoParser(this._resolver);\n\n // Store api version here (for now). Currently doesn't do anything\n this._apiVersion = options.apiVersion || DEFAULT_API_VERSION;\n }\n\n /**\n * improves the readability of the constructor.\n * based on a boolean returns the proper dependency resolution setting string.\n */\n private _checkDefaultDependencyResolution(customRepository: boolean): dependencyResolutionType {\n if (customRepository) {\n return \"enabled\";\n } else {\n return \"tryFromExpanded\";\n }\n }\n\n /**\n * Though currently not relevant, can specify API Version for communicating with\n * the service.\n */\n get apiVersion(): string {\n return this._apiVersion;\n }\n\n /**\n * Configured repository location for this instance. Will be used as the endpoint to get the models from.\n */\n get repositoryLocation(): string {\n return this._repositoryLocation;\n }\n\n /**\n * Configured type of dependency resolution for this instance. Dictates how the client deals with model dependencies.\n */\n get dependencyResolution(): dependencyResolutionType {\n return this._dependencyResolution;\n }\n\n /**\n * Because of the local / remote optionality of this client, the service client\n * must be dynamically generated based on the repository location. If the provided\n * repository location is a remote location, then this private method will be used\n * to create the IoT Models Repository Service Client.\n */\n private _createClient(options: ModelsRepositoryClientOptions): IoTModelsRepositoryServiceClient {\n const { ...pipelineOptions } = options;\n\n if (!pipelineOptions.userAgentOptions) {\n pipelineOptions.userAgentOptions = {};\n }\n if (pipelineOptions.userAgentOptions.userAgentPrefix) {\n pipelineOptions.userAgentOptions.userAgentPrefix = `${pipelineOptions.userAgentOptions.userAgentPrefix} ${DEFAULT_USER_AGENT}`;\n } else {\n pipelineOptions.userAgentOptions.userAgentPrefix = DEFAULT_USER_AGENT;\n }\n\n const internalPipelineOptions: InternalClientPipelineOptions = {\n ...pipelineOptions,\n ...{\n loggingOptions: {\n logger: logger.info,\n },\n },\n };\n\n const pipeline = createClientPipeline(internalPipelineOptions);\n const client = new IoTModelsRepositoryServiceClient(this._repositoryLocation, { pipeline });\n return client;\n }\n\n /**\n * The fetcher is an abstraction necessary since this client can communicate with remote or local\n * Model Repositories based on the provided location. It will analyze the provided location based\n * on that create either an HTTP Fetcher, which uses the IoT Models Repository Service Client,\n * or a Filesystem Fetcher.\n */\n private _createFetcher(location: string, options: ModelsRepositoryClientOptions): Fetcher {\n let locationURL;\n let fetcher;\n if (isLocalPath(location)) {\n // POSIX Filesystem Path or Windows Filesystem Path\n logger.info(`Repository location identified as filesystem path - using FilesystemFetcher`);\n fetcher = new FilesystemFetcher(normalize(location));\n } else {\n locationURL = new URL(location);\n const prot = locationURL.protocol;\n if (prot.includes(\"http\") || prot.includes(\"https\")) {\n logger.info(`Repository location identified as HTTP/HTTPS endpoint - using HttpFetcher`);\n const client = this._createClient(options);\n fetcher = new HttpFetcher(location, client);\n } else if (prot.includes(\"file\")) {\n // filesystem URI\n logger.info(\"Repository Location identified as filesystem URI - using FilesystemFetcher\");\n fetcher = new FilesystemFetcher(location);\n } else if (prot === \"\" && location.search(/\\.[a-zA-Z]{2,63}$/)) {\n // Web URL with protocol unspecified - default to HTTPS\n logger.info(\n \"Repository Location identified as remote endpoint without protocol specified - using HttpFetcher\",\n );\n const fLocation = \"https://\" + location;\n const client = this._createClient(options);\n fetcher = new HttpFetcher(fLocation, client);\n } else {\n throw new EvalError(`Unable to identify location: ${location}`);\n }\n }\n\n return fetcher;\n }\n\n /**\n * Retrieve one or more models based upon on or more provided dtmis.\n * @param dtmis - one dtmi represented as a string\n * @param options - options to govern behavior of model getter.\n */\n async getModels(dtmis: string, options?: GetModelsOptions): Promise<{ [dtmi: string]: unknown }>;\n /**\n * Retrieve one or more models based upon on or more provided dtmis.\n * @param dtmis - dtmi strings in an array.\n * @param options - options to govern behavior of model getter.\n */\n async getModels(\n dtmis: string[],\n options?: GetModelsOptions,\n ): Promise<{ [dtmi: string]: unknown }>;\n async getModels(\n dtmis: string | string[],\n options?: GetModelsOptions,\n ): Promise<{ [dtmi: string]: unknown }> {\n let modelMap: { [dtmi: string]: unknown };\n if (!Array.isArray(dtmis)) {\n dtmis = [dtmis];\n }\n\n const dependencyResolution = options?.dependencyResolution || this._dependencyResolution;\n\n if (dependencyResolution === DEPENDENCY_MODE_DISABLED) {\n logger.info(\"Getting models w/ dependency resolution mode: disabled\");\n logger.info(`Retreiving model(s): ${dtmis}...`);\n modelMap = await this._resolver.resolve(dtmis, false, options);\n } else if (dependencyResolution === DEPENDENCY_MODE_ENABLED) {\n logger.info(`Getting models w/ dependency resolution mode: enabled`);\n logger.info(`Retreiving model(s): ${dtmis}...`);\n const baseModelMap = await this._resolver.resolve(dtmis, false, options);\n const baseModelList = Object.keys(baseModelMap).map((key) => baseModelMap[key]);\n logger.info(`Retreiving model dependencies for ${dtmis}...`);\n modelMap = await this._pseudoParser.expand(baseModelList, false);\n } else if (dependencyResolution === DEPENDENCY_MODE_TRY_FROM_EXPANDED) {\n logger.info(`Getting models w/ dependency resolution mode: tryFromExpanded`);\n try {\n logger.info(`Retreiving expanded model(s): ${dtmis}...`);\n modelMap = await this._resolver.resolve(dtmis, true, options);\n } catch (e: any) {\n if (e.name === \"RestError\" && e.code === \"ResouceNotFound\") {\n logger.info(\"Could not retrieve model(s) from expanded model DTDL - \");\n const baseModelMap: { [dtmi: string]: unknown } = await this._resolver.resolve(\n dtmis,\n false,\n options,\n );\n const baseModelList = Object.keys(baseModelMap).map((key) => baseModelMap[key]);\n logger.info(`Retreiving model dependencies for ${dtmis}...`);\n modelMap = await this._pseudoParser.expand(baseModelList as DTDL[], true);\n } else {\n throw e;\n }\n }\n } else {\n throw EvalError(`Invalid dependency resolution mode: ${dependencyResolution}`);\n }\n\n return modelMap;\n }\n}\n"]}
@@ -6,6 +6,8 @@ import { DEFAULT_API_VERSION } from "./utils/constants.js";
6
6
  * @internal
7
7
  */
8
8
  export class IoTModelsRepositoryServiceClient extends ServiceClient {
9
+ url;
10
+ version;
9
11
  /**
10
12
  * Initializes a new instance of the IoTModelsRepositoryServiceClient class.
11
13
  *
@@ -17,7 +19,10 @@ export class IoTModelsRepositoryServiceClient extends ServiceClient {
17
19
  baseUri: `${url}`,
18
20
  requestContentType: "application/json; charset=utf-8",
19
21
  };
20
- const optionsWithDefaults = Object.assign(Object.assign({}, defaults), options);
22
+ const optionsWithDefaults = {
23
+ ...defaults,
24
+ ...options,
25
+ };
21
26
  super(optionsWithDefaults);
22
27
  this.url = url;
23
28
  this.version = options.version || DEFAULT_API_VERSION;
@@ -1 +1 @@
1
- {"version":3,"file":"modelsRepositoryServiceClient.js","sourceRoot":"","sources":["../../src/modelsRepositoryServiceClient.ts"],"names":[],"mappings":"AAAA,uCAAuC;AACvC,kCAAkC;AAGlC,OAAO,EAAE,aAAa,EAAE,MAAM,oBAAoB,CAAC;AACnD,OAAO,EAAE,mBAAmB,EAAE,MAAM,sBAAsB,CAAC;AAS3D;;GAEG;AACH,MAAM,OAAO,gCAAiC,SAAQ,aAAa;IAIjE;;;;;OAKG;IACH,YAAY,GAAW,EAAE,UAAmD,EAAE;QAC5E,MAAM,QAAQ,GAA4C;YACxD,OAAO,EAAE,GAAG,GAAG,EAAE;YACjB,kBAAkB,EAAE,iCAAiC;SACtD,CAAC;QAEF,MAAM,mBAAmB,mCACpB,QAAQ,GACR,OAAO,CACX,CAAC;QAEF,KAAK,CAAC,mBAAmB,CAAC,CAAC;QAE3B,IAAI,CAAC,GAAG,GAAG,GAAG,CAAC;QACf,IAAI,CAAC,OAAO,GAAG,OAAO,CAAC,OAAO,IAAI,mBAAmB,CAAC;IACxD,CAAC;CACF","sourcesContent":["// Copyright (c) Microsoft Corporation.\n// Licensed under the MIT License.\n\nimport type { ServiceClientOptions } from \"@azure/core-client\";\nimport { ServiceClient } from \"@azure/core-client\";\nimport { DEFAULT_API_VERSION } from \"./utils/constants.js\";\n\ninterface IoTModelsRepositoryServiceClientOptions extends ServiceClientOptions {\n // API Version to be used during HTTP Calls.\n version?: string;\n // Endpoint that will be base of URLs for HTTP calls.\n endpoint?: string;\n}\n\n/**\n * @internal\n */\nexport class IoTModelsRepositoryServiceClient extends ServiceClient {\n url: string;\n version: string;\n\n /**\n * Initializes a new instance of the IoTModelsRepositoryServiceClient class.\n *\n * @param url - The URL of the service account or table that is the target of the desired operation.\n * @param options - The parameter options\n */\n constructor(url: string, options: IoTModelsRepositoryServiceClientOptions = {}) {\n const defaults: IoTModelsRepositoryServiceClientOptions = {\n baseUri: `${url}`,\n requestContentType: \"application/json; charset=utf-8\",\n };\n\n const optionsWithDefaults = {\n ...defaults,\n ...options,\n };\n\n super(optionsWithDefaults);\n\n this.url = url;\n this.version = options.version || DEFAULT_API_VERSION;\n }\n}\n"]}
1
+ {"version":3,"file":"modelsRepositoryServiceClient.js","sourceRoot":"","sources":["../../src/modelsRepositoryServiceClient.ts"],"names":[],"mappings":"AAAA,uCAAuC;AACvC,kCAAkC;AAGlC,OAAO,EAAE,aAAa,EAAE,MAAM,oBAAoB,CAAC;AACnD,OAAO,EAAE,mBAAmB,EAAE,MAAM,sBAAsB,CAAC;AAS3D;;GAEG;AACH,MAAM,OAAO,gCAAiC,SAAQ,aAAa;IACjE,GAAG,CAAS;IACZ,OAAO,CAAS;IAEhB;;;;;OAKG;IACH,YAAY,GAAW,EAAE,UAAmD,EAAE;QAC5E,MAAM,QAAQ,GAA4C;YACxD,OAAO,EAAE,GAAG,GAAG,EAAE;YACjB,kBAAkB,EAAE,iCAAiC;SACtD,CAAC;QAEF,MAAM,mBAAmB,GAAG;YAC1B,GAAG,QAAQ;YACX,GAAG,OAAO;SACX,CAAC;QAEF,KAAK,CAAC,mBAAmB,CAAC,CAAC;QAE3B,IAAI,CAAC,GAAG,GAAG,GAAG,CAAC;QACf,IAAI,CAAC,OAAO,GAAG,OAAO,CAAC,OAAO,IAAI,mBAAmB,CAAC;IACxD,CAAC;CACF","sourcesContent":["// Copyright (c) Microsoft Corporation.\n// Licensed under the MIT License.\n\nimport type { ServiceClientOptions } from \"@azure/core-client\";\nimport { ServiceClient } from \"@azure/core-client\";\nimport { DEFAULT_API_VERSION } from \"./utils/constants.js\";\n\ninterface IoTModelsRepositoryServiceClientOptions extends ServiceClientOptions {\n // API Version to be used during HTTP Calls.\n version?: string;\n // Endpoint that will be base of URLs for HTTP calls.\n endpoint?: string;\n}\n\n/**\n * @internal\n */\nexport class IoTModelsRepositoryServiceClient extends ServiceClient {\n url: string;\n version: string;\n\n /**\n * Initializes a new instance of the IoTModelsRepositoryServiceClient class.\n *\n * @param url - The URL of the service account or table that is the target of the desired operation.\n * @param options - The parameter options\n */\n constructor(url: string, options: IoTModelsRepositoryServiceClientOptions = {}) {\n const defaults: IoTModelsRepositoryServiceClientOptions = {\n baseUri: `${url}`,\n requestContentType: \"application/json; charset=utf-8\",\n };\n\n const optionsWithDefaults = {\n ...defaults,\n ...options,\n };\n\n super(optionsWithDefaults);\n\n this.url = url;\n this.version = options.version || DEFAULT_API_VERSION;\n }\n}\n"]}
@@ -14,6 +14,7 @@ import { RestError } from "@azure/core-rest-pipeline";
14
14
  * @internal
15
15
  */
16
16
  export class PseudoParser {
17
+ _resolver;
17
18
  // eslint-disable-next-line @azure/azure-sdk/ts-use-interface-parameters
18
19
  constructor(resolver) {
19
20
  this._resolver = resolver;
@@ -1 +1 @@
1
- {"version":3,"file":"psuedoParser.js","sourceRoot":"","sources":["../../src/psuedoParser.ts"],"names":[],"mappings":"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","sourcesContent":["// Copyright (c) Microsoft Corporation.\n// Licensed under the MIT License.\n\nimport type { DTDL } from \"./psuedoDtdl.js\";\nimport { logger } from \"./logger.js\";\nimport type { DtmiResolver } from \"./dtmiResolver.js\";\nimport { RestError } from \"@azure/core-rest-pipeline\";\n\n/**\n * The PsuedoParser is an interesting implementation. Essentially, this\n * codebase works in tandem with a Digital Twins Parser, which simultaneously\n * defines the DTDL structure and validates models match the correct DTDL format.\n * In lieu of using that Parser as a dependency (for a complex network of reasons),\n * we implement this class, which kind of parses. Because it uses the resovler too,\n * we can, during psuedo-parsing, identify any times we should resolve a dependency,\n * and then resolve the dependencies until the dependency tree is fully resolved.\n *\n * @internal\n */\nexport class PseudoParser {\n private _resolver: DtmiResolver;\n\n // eslint-disable-next-line @azure/azure-sdk/ts-use-interface-parameters\n constructor(resolver: DtmiResolver) {\n this._resolver = resolver;\n }\n\n async expand(models: DTDL[], tryFromExpanded: boolean): Promise<{ [dtmi: string]: DTDL }> {\n const expandedMap: { [dtmi: string]: DTDL } = {};\n for (let i = 0; i < models.length; i++) {\n const model: DTDL = models[i];\n if (model[\"@id\"] !== undefined) {\n expandedMap[model[\"@id\"]] = model;\n } else {\n throw Error(`model ${model} does not contain @id member`);\n }\n await this._expand(model, expandedMap, tryFromExpanded);\n }\n return expandedMap;\n }\n\n private async _expand(\n model: DTDL,\n modelMap: { [dtmi: string]: DTDL },\n tryFromExpanded: boolean,\n ): Promise<void> {\n logger.info(`Expanding model: ${model[\"@id\"]}`);\n const dependencies = this._getModelDependencies(model);\n const dependenciesToResolve = dependencies.filter((dependency: string) => {\n return !(dependency in modelMap);\n });\n if (dependenciesToResolve.length !== 0) {\n logger.info(`Outstanding dependencies found: ${dependenciesToResolve}`);\n let resolvedDependenciesMap: { [s: string]: unknown };\n try {\n resolvedDependenciesMap = await this._resolver.resolve(\n dependenciesToResolve,\n tryFromExpanded,\n );\n } catch (e: any) {\n if (e instanceof RestError) {\n resolvedDependenciesMap = await this._resolver.resolve(dependenciesToResolve, false);\n } else {\n throw e;\n }\n }\n Object.keys(resolvedDependenciesMap).forEach((key) => {\n modelMap[key] = resolvedDependenciesMap[key] as DTDL;\n });\n const promiseList: Promise<void>[] = [];\n Object.values(resolvedDependenciesMap).forEach((dependencyModel) => {\n promiseList.push(this._expand(dependencyModel as DTDL, modelMap, tryFromExpanded));\n });\n await Promise.all(promiseList);\n }\n }\n\n private _getModelDependencies(model: DTDL): string[] {\n const dependencies = [];\n\n if (model.contents !== undefined) {\n const contents = model.contents;\n contents.forEach((element) => {\n if (\n element[\"@type\"] &&\n typeof element[\"@type\"] === \"string\" &&\n element[\"@type\"] === \"Component\"\n ) {\n if (element.schema && typeof element.schema === \"string\") {\n dependencies.push(element.schema);\n }\n }\n });\n }\n\n if (model.extends !== undefined) {\n if (typeof model.extends === \"string\") {\n dependencies.push(model.extends);\n } else if (Array.isArray(model.extends)) {\n model.extends.forEach((element) => {\n if (typeof element === \"string\") {\n dependencies.push(element);\n } else if (typeof element === \"object\") {\n dependencies.push(this._getModelDependencies(element));\n }\n });\n }\n }\n\n const noDuplicates = Array.from(new Set(dependencies));\n return noDuplicates;\n }\n}\n"]}
1
+ {"version":3,"file":"psuedoParser.js","sourceRoot":"","sources":["../../src/psuedoParser.ts"],"names":[],"mappings":"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","sourcesContent":["// Copyright (c) Microsoft Corporation.\n// Licensed under the MIT License.\n\nimport type { DTDL } from \"./psuedoDtdl.js\";\nimport { logger } from \"./logger.js\";\nimport type { DtmiResolver } from \"./dtmiResolver.js\";\nimport { RestError } from \"@azure/core-rest-pipeline\";\n\n/**\n * The PsuedoParser is an interesting implementation. Essentially, this\n * codebase works in tandem with a Digital Twins Parser, which simultaneously\n * defines the DTDL structure and validates models match the correct DTDL format.\n * In lieu of using that Parser as a dependency (for a complex network of reasons),\n * we implement this class, which kind of parses. Because it uses the resovler too,\n * we can, during psuedo-parsing, identify any times we should resolve a dependency,\n * and then resolve the dependencies until the dependency tree is fully resolved.\n *\n * @internal\n */\nexport class PseudoParser {\n private _resolver: DtmiResolver;\n\n // eslint-disable-next-line @azure/azure-sdk/ts-use-interface-parameters\n constructor(resolver: DtmiResolver) {\n this._resolver = resolver;\n }\n\n async expand(models: DTDL[], tryFromExpanded: boolean): Promise<{ [dtmi: string]: DTDL }> {\n const expandedMap: { [dtmi: string]: DTDL } = {};\n for (let i = 0; i < models.length; i++) {\n const model: DTDL = models[i];\n if (model[\"@id\"] !== undefined) {\n expandedMap[model[\"@id\"]] = model;\n } else {\n throw Error(`model ${model} does not contain @id member`);\n }\n await this._expand(model, expandedMap, tryFromExpanded);\n }\n return expandedMap;\n }\n\n private async _expand(\n model: DTDL,\n modelMap: { [dtmi: string]: DTDL },\n tryFromExpanded: boolean,\n ): Promise<void> {\n logger.info(`Expanding model: ${model[\"@id\"]}`);\n const dependencies = this._getModelDependencies(model);\n const dependenciesToResolve = dependencies.filter((dependency: string) => {\n return !(dependency in modelMap);\n });\n if (dependenciesToResolve.length !== 0) {\n logger.info(`Outstanding dependencies found: ${dependenciesToResolve}`);\n let resolvedDependenciesMap: { [s: string]: unknown };\n try {\n resolvedDependenciesMap = await this._resolver.resolve(\n dependenciesToResolve,\n tryFromExpanded,\n );\n } catch (e: any) {\n if (e instanceof RestError) {\n resolvedDependenciesMap = await this._resolver.resolve(dependenciesToResolve, false);\n } else {\n throw e;\n }\n }\n Object.keys(resolvedDependenciesMap).forEach((key) => {\n modelMap[key] = resolvedDependenciesMap[key] as DTDL;\n });\n const promiseList: Promise<void>[] = [];\n Object.values(resolvedDependenciesMap).forEach((dependencyModel) => {\n promiseList.push(this._expand(dependencyModel as DTDL, modelMap, tryFromExpanded));\n });\n await Promise.all(promiseList);\n }\n }\n\n private _getModelDependencies(model: DTDL): string[] {\n const dependencies = [];\n\n if (model.contents !== undefined) {\n const contents = model.contents;\n contents.forEach((element) => {\n if (\n element[\"@type\"] &&\n typeof element[\"@type\"] === \"string\" &&\n element[\"@type\"] === \"Component\"\n ) {\n if (element.schema && typeof element.schema === \"string\") {\n dependencies.push(element.schema);\n }\n }\n });\n }\n\n if (model.extends !== undefined) {\n if (typeof model.extends === \"string\") {\n dependencies.push(model.extends);\n } else if (Array.isArray(model.extends)) {\n model.extends.forEach((element) => {\n if (typeof element === \"string\") {\n dependencies.push(element);\n } else if (typeof element === \"object\") {\n dependencies.push(this._getModelDependencies(element));\n }\n });\n }\n }\n\n const noDuplicates = Array.from(new Set(dependencies));\n return noDuplicates;\n }\n}\n"]}
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@azure/iot-modelsrepository",
3
- "version": "1.0.0-alpha.20250619.1",
3
+ "version": "1.0.0-alpha.20250718.2",
4
4
  "description": "Device Model Repository Library with typescript type definitions for node.js and browser.",
5
5
  "sdk-type": "client",
6
6
  "main": "./dist/commonjs/index.js",
@@ -90,7 +90,7 @@
90
90
  },
91
91
  "type": "module",
92
92
  "tshy": {
93
- "project": "./tsconfig.src.json",
93
+ "project": "../../../tsconfig.src.build.json",
94
94
  "exports": {
95
95
  "./package.json": "./package.json",
96
96
  ".": "./src/index.ts"