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

package/dist/browser/dtmiResolver.js

@@ -13,6 +13,7 @@ import { logger } from "./logger.js";
  * @internal
  */
 export class DtmiResolver {
+    _fetcher;
     constructor(fetcher) {
         this._fetcher = fetcher;
     }

package/dist/browser/dtmiResolver.js.map

@@ -1 +1 @@
-{"version":3,"file":"dtmiResolver.js","sourceRoot":"","sources":["../../src/dtmiResolver.ts"],"names":[],"mappings":"AAAA,uCAAuC;AACvC,kCAAkC;AAIlC,OAAO,EAAE,iBAAiB,EAAE,MAAM,sBAAsB,CAAC;AACzD,OAAO,EAAE,UAAU,EAAE,MAAM,iBAAiB,CAAC;AAE7C,OAAO,EAAE,MAAM,EAAE,MAAM,aAAa,CAAC;AAErC;;;;;;;;GAQG;AACH,MAAM,OAAO,YAAY;IAEvB,YAAY,OAAgB;QAC1B,IAAI,CAAC,QAAQ,GAAG,OAAO,CAAC;IAC1B,CAAC;IAED,KAAK,CAAC,OAAO,CACX,KAAe,EACf,aAAsB,EACtB,OAA0B;QAE1B,MAAM,QAAQ,GAA6B,EAAE,CAAC;QAC9C,MAAM,YAAY,GAAG,KAAK,CAAC,GAAG,CAAC,KAAK,EAAE,IAAI,EAAE,EAAE;YAC5C,MAAM,QAAQ,GAAG,iBAAiB,CAAC,IAAI,EAAE,aAAa,CAAC,CAAC;YACxD,MAAM,CAAC,IAAI,CAAC,SAAS,IAAI,6BAA6B,QAAQ,EAAE,CAAC,CAAC;YAClE,MAAM,IAAI,GAAG,MAAM,IAAI,CAAC,QAAQ,CAAC,KAAK,CAAC,QAAQ,EAAE,OAAO,CAAC,CAAC;YAC1D,IAAI,aAAa,EAAE,CAAC;gBAClB,IAAI,KAAK,CAAC,OAAO,CAAC,IAAI,CAAC,EAAE,CAAC;oBACxB,MAAM,QAAQ,GAAc,IAAe,CAAC,GAAG,CAAC,CAAC,KAAW,EAAE,EAAE,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC,CAAC;oBAC/E,IAAI,CAAC,QAAQ,CAAC,QAAQ,CAAC,IAAI,CAAC,EAAE,CAAC;wBAC7B,MAAM,IAAI,UAAU,CAClB,6CAA6C,IAAI,eAAe,QAAQ,EAAE,CAC3E,CAAC;oBACJ,CAAC;oBACD,KAAK,MAAM,KAAK,IAAI,IAAI,EAAE,CAAC;wBACzB,QAAQ,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC,GAAG,KAAK,CAAC;oBACjC,CAAC;gBACH,CAAC;qBAAM,CAAC;oBACN,MAAM,IAAI,UAAU,CAAC,0DAA0D,CAAC,CAAC;gBACnF,CAAC;YACH,CAAC;iBAAM,CAAC;gBACN,MAAM,KAAK,GAAG,IAAY,CAAC;gBAC3B,IAAI,KAAK,CAAC,KAAK,CAAC,KAAK,IAAI,EAAE,CAAC;oBAC1B,MAAM,IAAI,UAAU,CAAC,4BAA4B,IAAI,cAAc,KAAK,CAAC,KAAK,CAAC,EAAE,CAAC,CAAC;gBACrF,CAAC;gBAED,QAAQ,CAAC,GAAG,IAAI,EAAE,CAAC,GAAG,KAAK,CAAC;YAC9B,CAAC;QACH,CAAC,CAAC,CAAC;QAEH,MAAM,OAAO,CAAC,GAAG,CAAC,YAAY,CAAC,CAAC;QAChC,OAAO,QAAQ,CAAC;IAClB,CAAC;CACF","sourcesContent":["// Copyright (c) Microsoft Corporation.\n// Licensed under the MIT License.\n\nimport type { OperationOptions } from \"@azure/core-client\";\nimport type { DTDL } from \"./psuedoDtdl.js\";\nimport { convertDtmiToPath } from \"./dtmiConventions.js\";\nimport { ModelError } from \"./exceptions.js\";\nimport type { Fetcher } from \"./fetcherAbstract.js\";\nimport { logger } from \"./logger.js\";\n\n/**\n * DtmiResolver handles reformatting the DTMIs to paths and passing options\n * down to the configured fetcher. It is almost like a middle man between the\n * user-facing API and the PsuedoParser (which identifies if there are sub-dependencies\n * to resolve), and the configured fetcher, which will go out to the endpoint,\n * either in the filesystem or through a URI, and actually get the model we want.\n *\n * @internal\n */\nexport class DtmiResolver {\n  private _fetcher: Fetcher;\n  constructor(fetcher: Fetcher) {\n    this._fetcher = fetcher;\n  }\n\n  async resolve(\n    dtmis: string[],\n    expandedModel: boolean,\n    options?: OperationOptions,\n  ): Promise<{ [dtmi: string]: DTDL }> {\n    const modelMap: { [dtmi: string]: DTDL } = {};\n    const dtdlPromises = dtmis.map(async (dtmi) => {\n      const dtdlPath = convertDtmiToPath(dtmi, expandedModel);\n      logger.info(`Model ${dtmi} located in repository at ${dtdlPath}`);\n      const dtdl = await this._fetcher.fetch(dtdlPath, options);\n      if (expandedModel) {\n        if (Array.isArray(dtdl)) {\n          const modelIds: string[] = (dtdl as DTDL[]).map((model: DTDL) => model[\"@id\"]);\n          if (!modelIds.includes(dtmi)) {\n            throw new ModelError(\n              `DTMI mismatch on expanded DTDL - Request: ${dtmi}, Response: ${modelIds}`,\n            );\n          }\n          for (const model of dtdl) {\n            modelMap[model[\"@id\"]] = model;\n          }\n        } else {\n          throw new ModelError(\"Expanded format should always return an array of models.\");\n        }\n      } else {\n        const model = dtdl as DTDL;\n        if (model[\"@id\"] !== dtmi) {\n          throw new ModelError(`DTMI mismatch - Request: ${dtmi}, Response ${model[\"@id\"]}`);\n        }\n\n        modelMap[`${dtmi}`] = model;\n      }\n    });\n\n    await Promise.all(dtdlPromises);\n    return modelMap;\n  }\n}\n"]}
+{"version":3,"file":"dtmiResolver.js","sourceRoot":"","sources":["../../src/dtmiResolver.ts"],"names":[],"mappings":"AAAA,uCAAuC;AACvC,kCAAkC;AAIlC,OAAO,EAAE,iBAAiB,EAAE,MAAM,sBAAsB,CAAC;AACzD,OAAO,EAAE,UAAU,EAAE,MAAM,iBAAiB,CAAC;AAE7C,OAAO,EAAE,MAAM,EAAE,MAAM,aAAa,CAAC;AAErC;;;;;;;;GAQG;AACH,MAAM,OAAO,YAAY;IACf,QAAQ,CAAU;IAC1B,YAAY,OAAgB;QAC1B,IAAI,CAAC,QAAQ,GAAG,OAAO,CAAC;IAC1B,CAAC;IAED,KAAK,CAAC,OAAO,CACX,KAAe,EACf,aAAsB,EACtB,OAA0B;QAE1B,MAAM,QAAQ,GAA6B,EAAE,CAAC;QAC9C,MAAM,YAAY,GAAG,KAAK,CAAC,GAAG,CAAC,KAAK,EAAE,IAAI,EAAE,EAAE;YAC5C,MAAM,QAAQ,GAAG,iBAAiB,CAAC,IAAI,EAAE,aAAa,CAAC,CAAC;YACxD,MAAM,CAAC,IAAI,CAAC,SAAS,IAAI,6BAA6B,QAAQ,EAAE,CAAC,CAAC;YAClE,MAAM,IAAI,GAAG,MAAM,IAAI,CAAC,QAAQ,CAAC,KAAK,CAAC,QAAQ,EAAE,OAAO,CAAC,CAAC;YAC1D,IAAI,aAAa,EAAE,CAAC;gBAClB,IAAI,KAAK,CAAC,OAAO,CAAC,IAAI,CAAC,EAAE,CAAC;oBACxB,MAAM,QAAQ,GAAc,IAAe,CAAC,GAAG,CAAC,CAAC,KAAW,EAAE,EAAE,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC,CAAC;oBAC/E,IAAI,CAAC,QAAQ,CAAC,QAAQ,CAAC,IAAI,CAAC,EAAE,CAAC;wBAC7B,MAAM,IAAI,UAAU,CAClB,6CAA6C,IAAI,eAAe,QAAQ,EAAE,CAC3E,CAAC;oBACJ,CAAC;oBACD,KAAK,MAAM,KAAK,IAAI,IAAI,EAAE,CAAC;wBACzB,QAAQ,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC,GAAG,KAAK,CAAC;oBACjC,CAAC;gBACH,CAAC;qBAAM,CAAC;oBACN,MAAM,IAAI,UAAU,CAAC,0DAA0D,CAAC,CAAC;gBACnF,CAAC;YACH,CAAC;iBAAM,CAAC;gBACN,MAAM,KAAK,GAAG,IAAY,CAAC;gBAC3B,IAAI,KAAK,CAAC,KAAK,CAAC,KAAK,IAAI,EAAE,CAAC;oBAC1B,MAAM,IAAI,UAAU,CAAC,4BAA4B,IAAI,cAAc,KAAK,CAAC,KAAK,CAAC,EAAE,CAAC,CAAC;gBACrF,CAAC;gBAED,QAAQ,CAAC,GAAG,IAAI,EAAE,CAAC,GAAG,KAAK,CAAC;YAC9B,CAAC;QACH,CAAC,CAAC,CAAC;QAEH,MAAM,OAAO,CAAC,GAAG,CAAC,YAAY,CAAC,CAAC;QAChC,OAAO,QAAQ,CAAC;IAClB,CAAC;CACF","sourcesContent":["// Copyright (c) Microsoft Corporation.\n// Licensed under the MIT License.\n\nimport type { OperationOptions } from \"@azure/core-client\";\nimport type { DTDL } from \"./psuedoDtdl.js\";\nimport { convertDtmiToPath } from \"./dtmiConventions.js\";\nimport { ModelError } from \"./exceptions.js\";\nimport type { Fetcher } from \"./fetcherAbstract.js\";\nimport { logger } from \"./logger.js\";\n\n/**\n * DtmiResolver handles reformatting the DTMIs to paths and passing options\n * down to the configured fetcher. It is almost like a middle man between the\n * user-facing API and the PsuedoParser (which identifies if there are sub-dependencies\n * to resolve), and the configured fetcher, which will go out to the endpoint,\n * either in the filesystem or through a URI, and actually get the model we want.\n *\n * @internal\n */\nexport class DtmiResolver {\n  private _fetcher: Fetcher;\n  constructor(fetcher: Fetcher) {\n    this._fetcher = fetcher;\n  }\n\n  async resolve(\n    dtmis: string[],\n    expandedModel: boolean,\n    options?: OperationOptions,\n  ): Promise<{ [dtmi: string]: DTDL }> {\n    const modelMap: { [dtmi: string]: DTDL } = {};\n    const dtdlPromises = dtmis.map(async (dtmi) => {\n      const dtdlPath = convertDtmiToPath(dtmi, expandedModel);\n      logger.info(`Model ${dtmi} located in repository at ${dtdlPath}`);\n      const dtdl = await this._fetcher.fetch(dtdlPath, options);\n      if (expandedModel) {\n        if (Array.isArray(dtdl)) {\n          const modelIds: string[] = (dtdl as DTDL[]).map((model: DTDL) => model[\"@id\"]);\n          if (!modelIds.includes(dtmi)) {\n            throw new ModelError(\n              `DTMI mismatch on expanded DTDL - Request: ${dtmi}, Response: ${modelIds}`,\n            );\n          }\n          for (const model of dtdl) {\n            modelMap[model[\"@id\"]] = model;\n          }\n        } else {\n          throw new ModelError(\"Expanded format should always return an array of models.\");\n        }\n      } else {\n        const model = dtdl as DTDL;\n        if (model[\"@id\"] !== dtmi) {\n          throw new ModelError(`DTMI mismatch - Request: ${dtmi}, Response ${model[\"@id\"]}`);\n        }\n\n        modelMap[`${dtmi}`] = model;\n      }\n    });\n\n    await Promise.all(dtdlPromises);\n    return modelMap;\n  }\n}\n"]}

package/dist/browser/fetcherHTTP.js

@@ -9,25 +9,26 @@ import { logger } from "./logger.js";
  * @internal
  */
 export class HttpFetcher {
+    _client;
+    _baseURL;
     // eslint-disable-next-line @azure/azure-sdk/ts-use-interface-parameters
     constructor(baseURL, client) {
         this._client = client;
         this._baseURL = baseURL;
     }
     async fetch(path, options) {
-        var _a, _b;
         logger.info(`Fetching ${path} from remote endpoint`);
         if (!options) {
             options = {};
         }
         const myURL = this._baseURL + "/" + path;
         const requestMethod = "GET";
-        const requestHeader = createHttpHeaders((_a = options.requestOptions) === null || _a === void 0 ? void 0 : _a.customHeaders);
+        const requestHeader = createHttpHeaders(options.requestOptions?.customHeaders);
         const requestOptions = {
             url: myURL,
             method: requestMethod,
             headers: requestHeader,
-            timeout: (_b = options.requestOptions) === null || _b === void 0 ? void 0 : _b.timeout,
+            timeout: options.requestOptions?.timeout,
             abortSignal: options.abortSignal,
             tracingOptions: options.tracingOptions,
             allowInsecureConnection: true,

package/dist/browser/fetcherHTTP.js.map

@@ -1 +1 @@
-{"version":3,"file":"fetcherHTTP.js","sourceRoot":"","sources":["../../src/fetcherHTTP.ts"],"names":[],"mappings":"AAAA,uCAAuC;AACvC,kCAAkC;AASlC,OAAO,EAAE,iBAAiB,EAAE,qBAAqB,EAAE,SAAS,EAAE,MAAM,2BAA2B,CAAC;AAChG,OAAO,EAAE,MAAM,EAAE,MAAM,aAAa,CAAC;AAIrC;;;;;GAKG;AACH,MAAM,OAAO,WAAW;IAItB,wEAAwE;IACxE,YAAY,OAAe,EAAE,MAAqB;QAChD,IAAI,CAAC,OAAO,GAAG,MAAM,CAAC;QACtB,IAAI,CAAC,QAAQ,GAAG,OAAO,CAAC;IAC1B,CAAC;IAED,KAAK,CAAC,KAAK,CAAC,IAAY,EAAE,OAA0B;;QAClD,MAAM,CAAC,IAAI,CAAC,YAAY,IAAI,uBAAuB,CAAC,CAAC;QACrD,IAAI,CAAC,OAAO,EAAE,CAAC;YACb,OAAO,GAAG,EAAE,CAAC;QACf,CAAC;QACD,MAAM,KAAK,GAAG,IAAI,CAAC,QAAQ,GAAG,GAAG,GAAG,IAAI,CAAC;QACzC,MAAM,aAAa,GAAgB,KAAK,CAAC;QACzC,MAAM,aAAa,GAAgB,iBAAiB,CAAC,MAAA,OAAO,CAAC,cAAc,0CAAE,aAAa,CAAC,CAAC;QAC5F,MAAM,cAAc,GAAG;YACrB,GAAG,EAAE,KAAK;YACV,MAAM,EAAE,aAAa;YACrB,OAAO,EAAE,aAAa;YACtB,OAAO,EAAE,MAAA,OAAO,CAAC,cAAc,0CAAE,OAAO;YACxC,WAAW,EAAE,OAAO,CAAC,WAAW;YAChC,cAAc,EAAE,OAAO,CAAC,cAAc;YACtC,uBAAuB,EAAE,IAAI;SAC9B,CAAC;QACF,MAAM,OAAO,GAAoB,qBAAqB,CAAC,cAAc,CAAC,CAAC;QACvE,MAAM,GAAG,GAAqB,MAAM,IAAI,CAAC,OAAO,CAAC,WAAW,CAAC,OAAO,CAAC,CAAC;QAEtE,IAAI,GAAG,CAAC,MAAM,IAAI,GAAG,IAAI,GAAG,CAAC,MAAM,GAAG,GAAG,EAAE,CAAC;YAC1C,MAAM,YAAY,GAAG,GAAG,CAAC,UAAU,IAAI,EAAE,CAAC;YAC1C,MAAM,UAAU,GAAkB,IAAI,CAAC,KAAK,CAAC,YAAY,CAAC,CAAC;YAC3D,OAAO,UAAU,CAAC;QACpB,CAAC;aAAM,CAAC;YACN,MAAM,IAAI,SAAS,CAAC,+CAA+C,EAAE;gBACnE,IAAI,EAAE,kBAAkB;gBACxB,UAAU,EAAE,GAAG,CAAC,MAAM;gBACtB,QAAQ,EAAE,GAAG;gBACb,OAAO,EAAE,OAAO;aACjB,CAAC,CAAC;QACL,CAAC;IACH,CAAC;CACF","sourcesContent":["// Copyright (c) Microsoft Corporation.\n// Licensed under the MIT License.\n\nimport type { OperationOptions, ServiceClient } from \"@azure/core-client\";\nimport type {\n  HttpHeaders,\n  HttpMethods,\n  PipelineRequest,\n  PipelineResponse,\n} from \"@azure/core-rest-pipeline\";\nimport { createHttpHeaders, createPipelineRequest, RestError } from \"@azure/core-rest-pipeline\";\nimport { logger } from \"./logger.js\";\nimport type { Fetcher } from \"./fetcherAbstract.js\";\nimport type { DTDL } from \"./psuedoDtdl.js\";\n\n/**\n * The HTTP Fetcher implements the Fetcher interface to\n * retrieve models through HTTP calls.\n *\n * @internal\n */\nexport class HttpFetcher implements Fetcher {\n  private _client: ServiceClient;\n  private _baseURL: string;\n\n  // eslint-disable-next-line @azure/azure-sdk/ts-use-interface-parameters\n  constructor(baseURL: string, client: ServiceClient) {\n    this._client = client;\n    this._baseURL = baseURL;\n  }\n\n  async fetch(path: string, options?: OperationOptions): Promise<DTDL | DTDL[]> {\n    logger.info(`Fetching ${path} from remote endpoint`);\n    if (!options) {\n      options = {};\n    }\n    const myURL = this._baseURL + \"/\" + path;\n    const requestMethod: HttpMethods = \"GET\";\n    const requestHeader: HttpHeaders = createHttpHeaders(options.requestOptions?.customHeaders);\n    const requestOptions = {\n      url: myURL,\n      method: requestMethod,\n      headers: requestHeader,\n      timeout: options.requestOptions?.timeout,\n      abortSignal: options.abortSignal,\n      tracingOptions: options.tracingOptions,\n      allowInsecureConnection: true,\n    };\n    const request: PipelineRequest = createPipelineRequest(requestOptions);\n    const res: PipelineResponse = await this._client.sendRequest(request);\n\n    if (res.status >= 200 && res.status < 400) {\n      const dtdlAsString = res.bodyAsText || \"\";\n      const parsedDtdl: DTDL | DTDL[] = JSON.parse(dtdlAsString);\n      return parsedDtdl;\n    } else {\n      throw new RestError(\"Error on HTTP Request in remote model fetcher\", {\n        code: \"ResourceNotFound\",\n        statusCode: res.status,\n        response: res,\n        request: request,\n      });\n    }\n  }\n}\n"]}
+{"version":3,"file":"fetcherHTTP.js","sourceRoot":"","sources":["../../src/fetcherHTTP.ts"],"names":[],"mappings":"AAAA,uCAAuC;AACvC,kCAAkC;AASlC,OAAO,EAAE,iBAAiB,EAAE,qBAAqB,EAAE,SAAS,EAAE,MAAM,2BAA2B,CAAC;AAChG,OAAO,EAAE,MAAM,EAAE,MAAM,aAAa,CAAC;AAIrC;;;;;GAKG;AACH,MAAM,OAAO,WAAW;IACd,OAAO,CAAgB;IACvB,QAAQ,CAAS;IAEzB,wEAAwE;IACxE,YAAY,OAAe,EAAE,MAAqB;QAChD,IAAI,CAAC,OAAO,GAAG,MAAM,CAAC;QACtB,IAAI,CAAC,QAAQ,GAAG,OAAO,CAAC;IAC1B,CAAC;IAED,KAAK,CAAC,KAAK,CAAC,IAAY,EAAE,OAA0B;QAClD,MAAM,CAAC,IAAI,CAAC,YAAY,IAAI,uBAAuB,CAAC,CAAC;QACrD,IAAI,CAAC,OAAO,EAAE,CAAC;YACb,OAAO,GAAG,EAAE,CAAC;QACf,CAAC;QACD,MAAM,KAAK,GAAG,IAAI,CAAC,QAAQ,GAAG,GAAG,GAAG,IAAI,CAAC;QACzC,MAAM,aAAa,GAAgB,KAAK,CAAC;QACzC,MAAM,aAAa,GAAgB,iBAAiB,CAAC,OAAO,CAAC,cAAc,EAAE,aAAa,CAAC,CAAC;QAC5F,MAAM,cAAc,GAAG;YACrB,GAAG,EAAE,KAAK;YACV,MAAM,EAAE,aAAa;YACrB,OAAO,EAAE,aAAa;YACtB,OAAO,EAAE,OAAO,CAAC,cAAc,EAAE,OAAO;YACxC,WAAW,EAAE,OAAO,CAAC,WAAW;YAChC,cAAc,EAAE,OAAO,CAAC,cAAc;YACtC,uBAAuB,EAAE,IAAI;SAC9B,CAAC;QACF,MAAM,OAAO,GAAoB,qBAAqB,CAAC,cAAc,CAAC,CAAC;QACvE,MAAM,GAAG,GAAqB,MAAM,IAAI,CAAC,OAAO,CAAC,WAAW,CAAC,OAAO,CAAC,CAAC;QAEtE,IAAI,GAAG,CAAC,MAAM,IAAI,GAAG,IAAI,GAAG,CAAC,MAAM,GAAG,GAAG,EAAE,CAAC;YAC1C,MAAM,YAAY,GAAG,GAAG,CAAC,UAAU,IAAI,EAAE,CAAC;YAC1C,MAAM,UAAU,GAAkB,IAAI,CAAC,KAAK,CAAC,YAAY,CAAC,CAAC;YAC3D,OAAO,UAAU,CAAC;QACpB,CAAC;aAAM,CAAC;YACN,MAAM,IAAI,SAAS,CAAC,+CAA+C,EAAE;gBACnE,IAAI,EAAE,kBAAkB;gBACxB,UAAU,EAAE,GAAG,CAAC,MAAM;gBACtB,QAAQ,EAAE,GAAG;gBACb,OAAO,EAAE,OAAO;aACjB,CAAC,CAAC;QACL,CAAC;IACH,CAAC;CACF","sourcesContent":["// Copyright (c) Microsoft Corporation.\n// Licensed under the MIT License.\n\nimport type { OperationOptions, ServiceClient } from \"@azure/core-client\";\nimport type {\n  HttpHeaders,\n  HttpMethods,\n  PipelineRequest,\n  PipelineResponse,\n} from \"@azure/core-rest-pipeline\";\nimport { createHttpHeaders, createPipelineRequest, RestError } from \"@azure/core-rest-pipeline\";\nimport { logger } from \"./logger.js\";\nimport type { Fetcher } from \"./fetcherAbstract.js\";\nimport type { DTDL } from \"./psuedoDtdl.js\";\n\n/**\n * The HTTP Fetcher implements the Fetcher interface to\n * retrieve models through HTTP calls.\n *\n * @internal\n */\nexport class HttpFetcher implements Fetcher {\n  private _client: ServiceClient;\n  private _baseURL: string;\n\n  // eslint-disable-next-line @azure/azure-sdk/ts-use-interface-parameters\n  constructor(baseURL: string, client: ServiceClient) {\n    this._client = client;\n    this._baseURL = baseURL;\n  }\n\n  async fetch(path: string, options?: OperationOptions): Promise<DTDL | DTDL[]> {\n    logger.info(`Fetching ${path} from remote endpoint`);\n    if (!options) {\n      options = {};\n    }\n    const myURL = this._baseURL + \"/\" + path;\n    const requestMethod: HttpMethods = \"GET\";\n    const requestHeader: HttpHeaders = createHttpHeaders(options.requestOptions?.customHeaders);\n    const requestOptions = {\n      url: myURL,\n      method: requestMethod,\n      headers: requestHeader,\n      timeout: options.requestOptions?.timeout,\n      abortSignal: options.abortSignal,\n      tracingOptions: options.tracingOptions,\n      allowInsecureConnection: true,\n    };\n    const request: PipelineRequest = createPipelineRequest(requestOptions);\n    const res: PipelineResponse = await this._client.sendRequest(request);\n\n    if (res.status >= 200 && res.status < 400) {\n      const dtdlAsString = res.bodyAsText || \"\";\n      const parsedDtdl: DTDL | DTDL[] = JSON.parse(dtdlAsString);\n      return parsedDtdl;\n    } else {\n      throw new RestError(\"Error on HTTP Request in remote model fetcher\", {\n        code: \"ResourceNotFound\",\n        statusCode: res.status,\n        response: res,\n        request: request,\n      });\n    }\n  }\n}\n"]}

package/dist/browser/modelsRepositoryClient.js

@@ -1,6 +1,5 @@
 // Copyright (c) Microsoft Corporation.
 // Licensed under the MIT License.
-import { __rest } from "tslib";
 import { DEFAULT_API_VERSION, DEFAULT_REPOSITORY_LOCATION, DEFAULT_USER_AGENT, DEPENDENCY_MODE_DISABLED, DEPENDENCY_MODE_ENABLED, DEPENDENCY_MODE_TRY_FROM_EXPANDED, } from "./utils/constants.js";
 import { createClientPipeline } from "@azure/core-client";
 import { isLocalPath, normalize } from "./utils/path.js";
@@ -14,6 +13,12 @@ import { HttpFetcher } from "./fetcherHTTP.js";
  * Initializes a new instance of the IoT Models Repository Client.
  */
 export class ModelsRepositoryClient {
+    _repositoryLocation;
+    _dependencyResolution;
+    _apiVersion;
+    _fetcher;
+    _resolver;
+    _pseudoParser;
     /**
      * The ModelsRepositoryClient constructor
      * @param options - The models repository client options that govern the behavior of the client.
@@ -69,7 +74,7 @@ export class ModelsRepositoryClient {
      * to create the IoT Models Repository Service Client.
      */
     _createClient(options) {
-        const pipelineOptions = __rest(options, []);
+        const { ...pipelineOptions } = options;
         if (!pipelineOptions.userAgentOptions) {
             pipelineOptions.userAgentOptions = {};
         }
@@ -79,11 +84,14 @@ export class ModelsRepositoryClient {
         else {
             pipelineOptions.userAgentOptions.userAgentPrefix = DEFAULT_USER_AGENT;
         }
-        const internalPipelineOptions = Object.assign(Object.assign({}, pipelineOptions), {
-            loggingOptions: {
-                logger: logger.info,
+        const internalPipelineOptions = {
+            ...pipelineOptions,
+            ...{
+                loggingOptions: {
+                    logger: logger.info,
+                },
             },
-        });
+        };
         const pipeline = createClientPipeline(internalPipelineOptions);
         const client = new IoTModelsRepositoryServiceClient(this._repositoryLocation, { pipeline });
         return client;
@@ -133,7 +141,7 @@ export class ModelsRepositoryClient {
         if (!Array.isArray(dtmis)) {
             dtmis = [dtmis];
         }
-        const dependencyResolution = (options === null || options === void 0 ? void 0 : options.dependencyResolution) || this._dependencyResolution;
+        const dependencyResolution = options?.dependencyResolution || this._dependencyResolution;
         if (dependencyResolution === DEPENDENCY_MODE_DISABLED) {
             logger.info("Getting models w/ dependency resolution mode: disabled");
             logger.info(`Retreiving model(s): ${dtmis}...`);

package/dist/browser/modelsRepositoryClient.js.map

@@ -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"]}
+{"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"]}

package/dist/browser/modelsRepositoryServiceClient.js

@@ -6,6 +6,8 @@ import { DEFAULT_API_VERSION } from "./utils/constants.js";
  * @internal
  */
 export class IoTModelsRepositoryServiceClient extends ServiceClient {
+    url;
+    version;
     /**
      * Initializes a new instance of the IoTModelsRepositoryServiceClient class.
      *
@@ -17,7 +19,10 @@ export class IoTModelsRepositoryServiceClient extends ServiceClient {
             baseUri: `${url}`,
             requestContentType: "application/json; charset=utf-8",
         };
-        const optionsWithDefaults = Object.assign(Object.assign({}, defaults), options);
+        const optionsWithDefaults = {
+            ...defaults,
+            ...options,
+        };
         super(optionsWithDefaults);
         this.url = url;
         this.version = options.version || DEFAULT_API_VERSION;

package/dist/browser/modelsRepositoryServiceClient.js.map

@@ -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"]}
+{"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"]}

package/dist/browser/psuedoParser.js

@@ -14,6 +14,7 @@ import { RestError } from "@azure/core-rest-pipeline";
  * @internal
  */
 export class PseudoParser {
+    _resolver;
     // eslint-disable-next-line @azure/azure-sdk/ts-use-interface-parameters
     constructor(resolver) {
         this._resolver = resolver;

package/dist/browser/psuedoParser.js.map

@@ -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"]}
+{"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/dist/commonjs/dtmiResolver.js

@@ -16,6 +16,7 @@ const logger_js_1 = require("./logger.js");
  * @internal
  */
 class DtmiResolver {
+    _fetcher;
     constructor(fetcher) {
         this._fetcher = fetcher;
     }

package/dist/commonjs/dtmiResolver.js.map

@@ -1 +1 @@
-{"version":3,"file":"dtmiResolver.js","sourceRoot":"","sources":["../../src/dtmiResolver.ts"],"names":[],"mappings":";AAAA,uCAAuC;AACvC,kCAAkC;;;AAIlC,6DAAyD;AACzD,mDAA6C;AAE7C,2CAAqC;AAErC;;;;;;;;GAQG;AACH,MAAa,YAAY;IAEvB,YAAY,OAAgB;QAC1B,IAAI,CAAC,QAAQ,GAAG,OAAO,CAAC;IAC1B,CAAC;IAED,KAAK,CAAC,OAAO,CACX,KAAe,EACf,aAAsB,EACtB,OAA0B;QAE1B,MAAM,QAAQ,GAA6B,EAAE,CAAC;QAC9C,MAAM,YAAY,GAAG,KAAK,CAAC,GAAG,CAAC,KAAK,EAAE,IAAI,EAAE,EAAE;YAC5C,MAAM,QAAQ,GAAG,IAAA,sCAAiB,EAAC,IAAI,EAAE,aAAa,CAAC,CAAC;YACxD,kBAAM,CAAC,IAAI,CAAC,SAAS,IAAI,6BAA6B,QAAQ,EAAE,CAAC,CAAC;YAClE,MAAM,IAAI,GAAG,MAAM,IAAI,CAAC,QAAQ,CAAC,KAAK,CAAC,QAAQ,EAAE,OAAO,CAAC,CAAC;YAC1D,IAAI,aAAa,EAAE,CAAC;gBAClB,IAAI,KAAK,CAAC,OAAO,CAAC,IAAI,CAAC,EAAE,CAAC;oBACxB,MAAM,QAAQ,GAAc,IAAe,CAAC,GAAG,CAAC,CAAC,KAAW,EAAE,EAAE,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC,CAAC;oBAC/E,IAAI,CAAC,QAAQ,CAAC,QAAQ,CAAC,IAAI,CAAC,EAAE,CAAC;wBAC7B,MAAM,IAAI,0BAAU,CAClB,6CAA6C,IAAI,eAAe,QAAQ,EAAE,CAC3E,CAAC;oBACJ,CAAC;oBACD,KAAK,MAAM,KAAK,IAAI,IAAI,EAAE,CAAC;wBACzB,QAAQ,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC,GAAG,KAAK,CAAC;oBACjC,CAAC;gBACH,CAAC;qBAAM,CAAC;oBACN,MAAM,IAAI,0BAAU,CAAC,0DAA0D,CAAC,CAAC;gBACnF,CAAC;YACH,CAAC;iBAAM,CAAC;gBACN,MAAM,KAAK,GAAG,IAAY,CAAC;gBAC3B,IAAI,KAAK,CAAC,KAAK,CAAC,KAAK,IAAI,EAAE,CAAC;oBAC1B,MAAM,IAAI,0BAAU,CAAC,4BAA4B,IAAI,cAAc,KAAK,CAAC,KAAK,CAAC,EAAE,CAAC,CAAC;gBACrF,CAAC;gBAED,QAAQ,CAAC,GAAG,IAAI,EAAE,CAAC,GAAG,KAAK,CAAC;YAC9B,CAAC;QACH,CAAC,CAAC,CAAC;QAEH,MAAM,OAAO,CAAC,GAAG,CAAC,YAAY,CAAC,CAAC;QAChC,OAAO,QAAQ,CAAC;IAClB,CAAC;CACF;AA3CD,oCA2CC","sourcesContent":["// Copyright (c) Microsoft Corporation.\n// Licensed under the MIT License.\n\nimport type { OperationOptions } from \"@azure/core-client\";\nimport type { DTDL } from \"./psuedoDtdl.js\";\nimport { convertDtmiToPath } from \"./dtmiConventions.js\";\nimport { ModelError } from \"./exceptions.js\";\nimport type { Fetcher } from \"./fetcherAbstract.js\";\nimport { logger } from \"./logger.js\";\n\n/**\n * DtmiResolver handles reformatting the DTMIs to paths and passing options\n * down to the configured fetcher. It is almost like a middle man between the\n * user-facing API and the PsuedoParser (which identifies if there are sub-dependencies\n * to resolve), and the configured fetcher, which will go out to the endpoint,\n * either in the filesystem or through a URI, and actually get the model we want.\n *\n * @internal\n */\nexport class DtmiResolver {\n  private _fetcher: Fetcher;\n  constructor(fetcher: Fetcher) {\n    this._fetcher = fetcher;\n  }\n\n  async resolve(\n    dtmis: string[],\n    expandedModel: boolean,\n    options?: OperationOptions,\n  ): Promise<{ [dtmi: string]: DTDL }> {\n    const modelMap: { [dtmi: string]: DTDL } = {};\n    const dtdlPromises = dtmis.map(async (dtmi) => {\n      const dtdlPath = convertDtmiToPath(dtmi, expandedModel);\n      logger.info(`Model ${dtmi} located in repository at ${dtdlPath}`);\n      const dtdl = await this._fetcher.fetch(dtdlPath, options);\n      if (expandedModel) {\n        if (Array.isArray(dtdl)) {\n          const modelIds: string[] = (dtdl as DTDL[]).map((model: DTDL) => model[\"@id\"]);\n          if (!modelIds.includes(dtmi)) {\n            throw new ModelError(\n              `DTMI mismatch on expanded DTDL - Request: ${dtmi}, Response: ${modelIds}`,\n            );\n          }\n          for (const model of dtdl) {\n            modelMap[model[\"@id\"]] = model;\n          }\n        } else {\n          throw new ModelError(\"Expanded format should always return an array of models.\");\n        }\n      } else {\n        const model = dtdl as DTDL;\n        if (model[\"@id\"] !== dtmi) {\n          throw new ModelError(`DTMI mismatch - Request: ${dtmi}, Response ${model[\"@id\"]}`);\n        }\n\n        modelMap[`${dtmi}`] = model;\n      }\n    });\n\n    await Promise.all(dtdlPromises);\n    return modelMap;\n  }\n}\n"]}
+{"version":3,"file":"dtmiResolver.js","sourceRoot":"","sources":["../../src/dtmiResolver.ts"],"names":[],"mappings":";AAAA,uCAAuC;AACvC,kCAAkC;;;AAIlC,6DAAyD;AACzD,mDAA6C;AAE7C,2CAAqC;AAErC;;;;;;;;GAQG;AACH,MAAa,YAAY;IACf,QAAQ,CAAU;IAC1B,YAAY,OAAgB;QAC1B,IAAI,CAAC,QAAQ,GAAG,OAAO,CAAC;IAC1B,CAAC;IAED,KAAK,CAAC,OAAO,CACX,KAAe,EACf,aAAsB,EACtB,OAA0B;QAE1B,MAAM,QAAQ,GAA6B,EAAE,CAAC;QAC9C,MAAM,YAAY,GAAG,KAAK,CAAC,GAAG,CAAC,KAAK,EAAE,IAAI,EAAE,EAAE;YAC5C,MAAM,QAAQ,GAAG,IAAA,sCAAiB,EAAC,IAAI,EAAE,aAAa,CAAC,CAAC;YACxD,kBAAM,CAAC,IAAI,CAAC,SAAS,IAAI,6BAA6B,QAAQ,EAAE,CAAC,CAAC;YAClE,MAAM,IAAI,GAAG,MAAM,IAAI,CAAC,QAAQ,CAAC,KAAK,CAAC,QAAQ,EAAE,OAAO,CAAC,CAAC;YAC1D,IAAI,aAAa,EAAE,CAAC;gBAClB,IAAI,KAAK,CAAC,OAAO,CAAC,IAAI,CAAC,EAAE,CAAC;oBACxB,MAAM,QAAQ,GAAc,IAAe,CAAC,GAAG,CAAC,CAAC,KAAW,EAAE,EAAE,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC,CAAC;oBAC/E,IAAI,CAAC,QAAQ,CAAC,QAAQ,CAAC,IAAI,CAAC,EAAE,CAAC;wBAC7B,MAAM,IAAI,0BAAU,CAClB,6CAA6C,IAAI,eAAe,QAAQ,EAAE,CAC3E,CAAC;oBACJ,CAAC;oBACD,KAAK,MAAM,KAAK,IAAI,IAAI,EAAE,CAAC;wBACzB,QAAQ,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC,GAAG,KAAK,CAAC;oBACjC,CAAC;gBACH,CAAC;qBAAM,CAAC;oBACN,MAAM,IAAI,0BAAU,CAAC,0DAA0D,CAAC,CAAC;gBACnF,CAAC;YACH,CAAC;iBAAM,CAAC;gBACN,MAAM,KAAK,GAAG,IAAY,CAAC;gBAC3B,IAAI,KAAK,CAAC,KAAK,CAAC,KAAK,IAAI,EAAE,CAAC;oBAC1B,MAAM,IAAI,0BAAU,CAAC,4BAA4B,IAAI,cAAc,KAAK,CAAC,KAAK,CAAC,EAAE,CAAC,CAAC;gBACrF,CAAC;gBAED,QAAQ,CAAC,GAAG,IAAI,EAAE,CAAC,GAAG,KAAK,CAAC;YAC9B,CAAC;QACH,CAAC,CAAC,CAAC;QAEH,MAAM,OAAO,CAAC,GAAG,CAAC,YAAY,CAAC,CAAC;QAChC,OAAO,QAAQ,CAAC;IAClB,CAAC;CACF;AA3CD,oCA2CC","sourcesContent":["// Copyright (c) Microsoft Corporation.\n// Licensed under the MIT License.\n\nimport type { OperationOptions } from \"@azure/core-client\";\nimport type { DTDL } from \"./psuedoDtdl.js\";\nimport { convertDtmiToPath } from \"./dtmiConventions.js\";\nimport { ModelError } from \"./exceptions.js\";\nimport type { Fetcher } from \"./fetcherAbstract.js\";\nimport { logger } from \"./logger.js\";\n\n/**\n * DtmiResolver handles reformatting the DTMIs to paths and passing options\n * down to the configured fetcher. It is almost like a middle man between the\n * user-facing API and the PsuedoParser (which identifies if there are sub-dependencies\n * to resolve), and the configured fetcher, which will go out to the endpoint,\n * either in the filesystem or through a URI, and actually get the model we want.\n *\n * @internal\n */\nexport class DtmiResolver {\n  private _fetcher: Fetcher;\n  constructor(fetcher: Fetcher) {\n    this._fetcher = fetcher;\n  }\n\n  async resolve(\n    dtmis: string[],\n    expandedModel: boolean,\n    options?: OperationOptions,\n  ): Promise<{ [dtmi: string]: DTDL }> {\n    const modelMap: { [dtmi: string]: DTDL } = {};\n    const dtdlPromises = dtmis.map(async (dtmi) => {\n      const dtdlPath = convertDtmiToPath(dtmi, expandedModel);\n      logger.info(`Model ${dtmi} located in repository at ${dtdlPath}`);\n      const dtdl = await this._fetcher.fetch(dtdlPath, options);\n      if (expandedModel) {\n        if (Array.isArray(dtdl)) {\n          const modelIds: string[] = (dtdl as DTDL[]).map((model: DTDL) => model[\"@id\"]);\n          if (!modelIds.includes(dtmi)) {\n            throw new ModelError(\n              `DTMI mismatch on expanded DTDL - Request: ${dtmi}, Response: ${modelIds}`,\n            );\n          }\n          for (const model of dtdl) {\n            modelMap[model[\"@id\"]] = model;\n          }\n        } else {\n          throw new ModelError(\"Expanded format should always return an array of models.\");\n        }\n      } else {\n        const model = dtdl as DTDL;\n        if (model[\"@id\"] !== dtmi) {\n          throw new ModelError(`DTMI mismatch - Request: ${dtmi}, Response ${model[\"@id\"]}`);\n        }\n\n        modelMap[`${dtmi}`] = model;\n      }\n    });\n\n    await Promise.all(dtdlPromises);\n    return modelMap;\n  }\n}\n"]}

package/dist/commonjs/fetcherFilesystem.js

@@ -5,7 +5,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.FilesystemFetcher = void 0;
 const tslib_1 = require("tslib");
 const node_fs_1 = tslib_1.__importDefault(require("node:fs"));
-const path = tslib_1.__importStar(require("node:path"));
+const node_path_1 = tslib_1.__importDefault(require("node:path"));
 const core_rest_pipeline_1 = require("@azure/core-rest-pipeline");
 const logger_js_1 = require("./logger.js");
 function readFilePromise(filePath) {
@@ -28,12 +28,13 @@ function readFilePromise(filePath) {
  * @internal
  */
 class FilesystemFetcher {
+    _baseFilePath;
     constructor(baseFilePath) {
         this._baseFilePath = baseFilePath;
     }
     async fetch(filePath) {
         logger_js_1.logger.info(`Fetching ${filePath} from local filesystem`);
-        const absolutePath = path.join(this._baseFilePath, filePath);
+        const absolutePath = node_path_1.default.join(this._baseFilePath, filePath);
         if (absolutePath.indexOf(this._baseFilePath) !== 0) {
             throw new Error("Attempted to escape base file path");
         }
@@ -46,7 +47,7 @@ class FilesystemFetcher {
         catch (e) {
             const options = {
                 code: "ResourceNotFound",
-                statusCode: e === null || e === void 0 ? void 0 : e.status,
+                statusCode: e?.status,
             };
             throw new core_rest_pipeline_1.RestError("Failed to fetch from Filesystem", options);
         }

package/dist/commonjs/fetcherFilesystem.js.map

@@ -1 +1 @@
-{"version":3,"file":"fetcherFilesystem.js","sourceRoot":"","sources":["../../src/fetcherFilesystem.ts"],"names":[],"mappings":";AAAA,uCAAuC;AACvC,kCAAkC;;;;AAElC,8DAAyB;AACzB,wDAAkC;AAElC,kEAAsD;AAEtD,2CAAqC;AAGrC,SAAS,eAAe,CAAC,QAAgB;IACvC,OAAO,IAAI,OAAO,CAAC,CAAC,OAAO,EAAE,MAAM,EAAE,EAAE;QACrC,iBAAE,CAAC,QAAQ,CAAC,QAAQ,EAAE,MAAM,EAAE,CAAC,GAAG,EAAE,IAAI,EAAE,EAAE;YAC1C,IAAI,GAAG,KAAK,SAAS,EAAE,CAAC;gBACtB,MAAM,CAAC,GAAG,CAAC,CAAC;YACd,CAAC;iBAAM,CAAC;gBACN,OAAO,CAAC,IAAI,CAAC,CAAC;YAChB,CAAC;YACD,OAAO,CAAC,CAAC;QACX,CAAC,CAAC,CAAC;IACL,CAAC,CAAC,CAAC;AACL,CAAC;AAED;;;;;GAKG;AACH,MAAa,iBAAiB;IAG5B,YAAY,YAAoB;QAC9B,IAAI,CAAC,aAAa,GAAG,YAAY,CAAC;IACpC,CAAC;IAED,KAAK,CAAC,KAAK,CAAC,QAAgB;QAC1B,kBAAM,CAAC,IAAI,CAAC,YAAY,QAAQ,wBAAwB,CAAC,CAAC;QAC1D,MAAM,YAAY,GAAG,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,aAAa,EAAE,QAAQ,CAAC,CAAC;QAC7D,IAAI,YAAY,CAAC,OAAO,CAAC,IAAI,CAAC,aAAa,CAAC,KAAK,CAAC,EAAE,CAAC;YACnD,MAAM,IAAI,KAAK,CAAC,oCAAoC,CAAC,CAAC;QACxD,CAAC;QAED,IAAI,CAAC;YACH,kBAAM,CAAC,IAAI,CAAC,gBAAgB,YAAY,EAAE,CAAC,CAAC;YAC5C,MAAM,QAAQ,GAAG,MAAM,eAAe,CAAC,YAAY,CAAC,CAAC;YACrD,MAAM,UAAU,GAAkB,IAAI,CAAC,KAAK,CAAC,QAAQ,CAAC,CAAC;YACvD,OAAO,UAAU,CAAC;QACpB,CAAC;QAAC,OAAO,CAAM,EAAE,CAAC;YAChB,MAAM,OAAO,GAAqB;gBAChC,IAAI,EAAE,kBAAkB;gBACxB,UAAU,EAAE,CAAC,aAAD,CAAC,uBAAD,CAAC,CAAE,MAAM;aACtB,CAAC;YACF,MAAM,IAAI,8BAAS,CAAC,iCAAiC,EAAE,OAAO,CAAC,CAAC;QAClE,CAAC;IACH,CAAC;CACF;AA3BD,8CA2BC","sourcesContent":["// Copyright (c) Microsoft Corporation.\n// Licensed under the MIT License.\n\nimport fs from \"node:fs\";\nimport * as path from \"node:path\";\nimport type { RestErrorOptions } from \"@azure/core-rest-pipeline\";\nimport { RestError } from \"@azure/core-rest-pipeline\";\nimport type { Fetcher } from \"./fetcherAbstract.js\";\nimport { logger } from \"./logger.js\";\nimport type { DTDL } from \"./psuedoDtdl.js\";\n\nfunction readFilePromise(filePath: string): Promise<string> {\n  return new Promise((resolve, reject) => {\n    fs.readFile(filePath, \"utf8\", (err, data) => {\n      if (err !== undefined) {\n        reject(err);\n      } else {\n        resolve(data);\n      }\n      return 0;\n    });\n  });\n}\n\n/**\n * The Filesystem Fetcher implements the generic Fetcher interface\n * so that models are fetched from a filesystem endpoint.\n *\n * @internal\n */\nexport class FilesystemFetcher implements Fetcher {\n  private _baseFilePath: string;\n\n  constructor(baseFilePath: string) {\n    this._baseFilePath = baseFilePath;\n  }\n\n  async fetch(filePath: string): Promise<DTDL | DTDL[]> {\n    logger.info(`Fetching ${filePath} from local filesystem`);\n    const absolutePath = path.join(this._baseFilePath, filePath);\n    if (absolutePath.indexOf(this._baseFilePath) !== 0) {\n      throw new Error(\"Attempted to escape base file path\");\n    }\n\n    try {\n      logger.info(`File open on ${absolutePath}`);\n      const dtdlFile = await readFilePromise(absolutePath);\n      const parsedDtdl: DTDL | DTDL[] = JSON.parse(dtdlFile);\n      return parsedDtdl;\n    } catch (e: any) {\n      const options: RestErrorOptions = {\n        code: \"ResourceNotFound\",\n        statusCode: e?.status,\n      };\n      throw new RestError(\"Failed to fetch from Filesystem\", options);\n    }\n  }\n}\n"]}
+{"version":3,"file":"fetcherFilesystem.js","sourceRoot":"","sources":["../../src/fetcherFilesystem.ts"],"names":[],"mappings":";AAAA,uCAAuC;AACvC,kCAAkC;;;;AAElC,8DAAyB;AACzB,kEAA6B;AAE7B,kEAAsD;AAEtD,2CAAqC;AAGrC,SAAS,eAAe,CAAC,QAAgB;IACvC,OAAO,IAAI,OAAO,CAAC,CAAC,OAAO,EAAE,MAAM,EAAE,EAAE;QACrC,iBAAE,CAAC,QAAQ,CAAC,QAAQ,EAAE,MAAM,EAAE,CAAC,GAAG,EAAE,IAAI,EAAE,EAAE;YAC1C,IAAI,GAAG,KAAK,SAAS,EAAE,CAAC;gBACtB,MAAM,CAAC,GAAG,CAAC,CAAC;YACd,CAAC;iBAAM,CAAC;gBACN,OAAO,CAAC,IAAI,CAAC,CAAC;YAChB,CAAC;YACD,OAAO,CAAC,CAAC;QACX,CAAC,CAAC,CAAC;IACL,CAAC,CAAC,CAAC;AACL,CAAC;AAED;;;;;GAKG;AACH,MAAa,iBAAiB;IACpB,aAAa,CAAS;IAE9B,YAAY,YAAoB;QAC9B,IAAI,CAAC,aAAa,GAAG,YAAY,CAAC;IACpC,CAAC;IAED,KAAK,CAAC,KAAK,CAAC,QAAgB;QAC1B,kBAAM,CAAC,IAAI,CAAC,YAAY,QAAQ,wBAAwB,CAAC,CAAC;QAC1D,MAAM,YAAY,GAAG,mBAAI,CAAC,IAAI,CAAC,IAAI,CAAC,aAAa,EAAE,QAAQ,CAAC,CAAC;QAC7D,IAAI,YAAY,CAAC,OAAO,CAAC,IAAI,CAAC,aAAa,CAAC,KAAK,CAAC,EAAE,CAAC;YACnD,MAAM,IAAI,KAAK,CAAC,oCAAoC,CAAC,CAAC;QACxD,CAAC;QAED,IAAI,CAAC;YACH,kBAAM,CAAC,IAAI,CAAC,gBAAgB,YAAY,EAAE,CAAC,CAAC;YAC5C,MAAM,QAAQ,GAAG,MAAM,eAAe,CAAC,YAAY,CAAC,CAAC;YACrD,MAAM,UAAU,GAAkB,IAAI,CAAC,KAAK,CAAC,QAAQ,CAAC,CAAC;YACvD,OAAO,UAAU,CAAC;QACpB,CAAC;QAAC,OAAO,CAAM,EAAE,CAAC;YAChB,MAAM,OAAO,GAAqB;gBAChC,IAAI,EAAE,kBAAkB;gBACxB,UAAU,EAAE,CAAC,EAAE,MAAM;aACtB,CAAC;YACF,MAAM,IAAI,8BAAS,CAAC,iCAAiC,EAAE,OAAO,CAAC,CAAC;QAClE,CAAC;IACH,CAAC;CACF;AA3BD,8CA2BC","sourcesContent":["// Copyright (c) Microsoft Corporation.\n// Licensed under the MIT License.\n\nimport fs from \"node:fs\";\nimport path from \"node:path\";\nimport type { RestErrorOptions } from \"@azure/core-rest-pipeline\";\nimport { RestError } from \"@azure/core-rest-pipeline\";\nimport type { Fetcher } from \"./fetcherAbstract.js\";\nimport { logger } from \"./logger.js\";\nimport type { DTDL } from \"./psuedoDtdl.js\";\n\nfunction readFilePromise(filePath: string): Promise<string> {\n  return new Promise((resolve, reject) => {\n    fs.readFile(filePath, \"utf8\", (err, data) => {\n      if (err !== undefined) {\n        reject(err);\n      } else {\n        resolve(data);\n      }\n      return 0;\n    });\n  });\n}\n\n/**\n * The Filesystem Fetcher implements the generic Fetcher interface\n * so that models are fetched from a filesystem endpoint.\n *\n * @internal\n */\nexport class FilesystemFetcher implements Fetcher {\n  private _baseFilePath: string;\n\n  constructor(baseFilePath: string) {\n    this._baseFilePath = baseFilePath;\n  }\n\n  async fetch(filePath: string): Promise<DTDL | DTDL[]> {\n    logger.info(`Fetching ${filePath} from local filesystem`);\n    const absolutePath = path.join(this._baseFilePath, filePath);\n    if (absolutePath.indexOf(this._baseFilePath) !== 0) {\n      throw new Error(\"Attempted to escape base file path\");\n    }\n\n    try {\n      logger.info(`File open on ${absolutePath}`);\n      const dtdlFile = await readFilePromise(absolutePath);\n      const parsedDtdl: DTDL | DTDL[] = JSON.parse(dtdlFile);\n      return parsedDtdl;\n    } catch (e: any) {\n      const options: RestErrorOptions = {\n        code: \"ResourceNotFound\",\n        statusCode: e?.status,\n      };\n      throw new RestError(\"Failed to fetch from Filesystem\", options);\n    }\n  }\n}\n"]}

package/dist/commonjs/fetcherHTTP.js

@@ -12,25 +12,26 @@ const logger_js_1 = require("./logger.js");
  * @internal
  */
 class HttpFetcher {
+    _client;
+    _baseURL;
     // eslint-disable-next-line @azure/azure-sdk/ts-use-interface-parameters
     constructor(baseURL, client) {
         this._client = client;
         this._baseURL = baseURL;
     }
     async fetch(path, options) {
-        var _a, _b;
         logger_js_1.logger.info(`Fetching ${path} from remote endpoint`);
         if (!options) {
             options = {};
         }
         const myURL = this._baseURL + "/" + path;
         const requestMethod = "GET";
-        const requestHeader = (0, core_rest_pipeline_1.createHttpHeaders)((_a = options.requestOptions) === null || _a === void 0 ? void 0 : _a.customHeaders);
+        const requestHeader = (0, core_rest_pipeline_1.createHttpHeaders)(options.requestOptions?.customHeaders);
         const requestOptions = {
             url: myURL,
             method: requestMethod,
             headers: requestHeader,
-            timeout: (_b = options.requestOptions) === null || _b === void 0 ? void 0 : _b.timeout,
+            timeout: options.requestOptions?.timeout,
             abortSignal: options.abortSignal,
             tracingOptions: options.tracingOptions,
             allowInsecureConnection: true,

package/dist/commonjs/fetcherHTTP.js.map

@@ -1 +1 @@
-{"version":3,"file":"fetcherHTTP.js","sourceRoot":"","sources":["../../src/fetcherHTTP.ts"],"names":[],"mappings":";AAAA,uCAAuC;AACvC,kCAAkC;;;AASlC,kEAAgG;AAChG,2CAAqC;AAIrC;;;;;GAKG;AACH,MAAa,WAAW;IAItB,wEAAwE;IACxE,YAAY,OAAe,EAAE,MAAqB;QAChD,IAAI,CAAC,OAAO,GAAG,MAAM,CAAC;QACtB,IAAI,CAAC,QAAQ,GAAG,OAAO,CAAC;IAC1B,CAAC;IAED,KAAK,CAAC,KAAK,CAAC,IAAY,EAAE,OAA0B;;QAClD,kBAAM,CAAC,IAAI,CAAC,YAAY,IAAI,uBAAuB,CAAC,CAAC;QACrD,IAAI,CAAC,OAAO,EAAE,CAAC;YACb,OAAO,GAAG,EAAE,CAAC;QACf,CAAC;QACD,MAAM,KAAK,GAAG,IAAI,CAAC,QAAQ,GAAG,GAAG,GAAG,IAAI,CAAC;QACzC,MAAM,aAAa,GAAgB,KAAK,CAAC;QACzC,MAAM,aAAa,GAAgB,IAAA,sCAAiB,EAAC,MAAA,OAAO,CAAC,cAAc,0CAAE,aAAa,CAAC,CAAC;QAC5F,MAAM,cAAc,GAAG;YACrB,GAAG,EAAE,KAAK;YACV,MAAM,EAAE,aAAa;YACrB,OAAO,EAAE,aAAa;YACtB,OAAO,EAAE,MAAA,OAAO,CAAC,cAAc,0CAAE,OAAO;YACxC,WAAW,EAAE,OAAO,CAAC,WAAW;YAChC,cAAc,EAAE,OAAO,CAAC,cAAc;YACtC,uBAAuB,EAAE,IAAI;SAC9B,CAAC;QACF,MAAM,OAAO,GAAoB,IAAA,0CAAqB,EAAC,cAAc,CAAC,CAAC;QACvE,MAAM,GAAG,GAAqB,MAAM,IAAI,CAAC,OAAO,CAAC,WAAW,CAAC,OAAO,CAAC,CAAC;QAEtE,IAAI,GAAG,CAAC,MAAM,IAAI,GAAG,IAAI,GAAG,CAAC,MAAM,GAAG,GAAG,EAAE,CAAC;YAC1C,MAAM,YAAY,GAAG,GAAG,CAAC,UAAU,IAAI,EAAE,CAAC;YAC1C,MAAM,UAAU,GAAkB,IAAI,CAAC,KAAK,CAAC,YAAY,CAAC,CAAC;YAC3D,OAAO,UAAU,CAAC;QACpB,CAAC;aAAM,CAAC;YACN,MAAM,IAAI,8BAAS,CAAC,+CAA+C,EAAE;gBACnE,IAAI,EAAE,kBAAkB;gBACxB,UAAU,EAAE,GAAG,CAAC,MAAM;gBACtB,QAAQ,EAAE,GAAG;gBACb,OAAO,EAAE,OAAO;aACjB,CAAC,CAAC;QACL,CAAC;IACH,CAAC;CACF;AA3CD,kCA2CC","sourcesContent":["// Copyright (c) Microsoft Corporation.\n// Licensed under the MIT License.\n\nimport type { OperationOptions, ServiceClient } from \"@azure/core-client\";\nimport type {\n  HttpHeaders,\n  HttpMethods,\n  PipelineRequest,\n  PipelineResponse,\n} from \"@azure/core-rest-pipeline\";\nimport { createHttpHeaders, createPipelineRequest, RestError } from \"@azure/core-rest-pipeline\";\nimport { logger } from \"./logger.js\";\nimport type { Fetcher } from \"./fetcherAbstract.js\";\nimport type { DTDL } from \"./psuedoDtdl.js\";\n\n/**\n * The HTTP Fetcher implements the Fetcher interface to\n * retrieve models through HTTP calls.\n *\n * @internal\n */\nexport class HttpFetcher implements Fetcher {\n  private _client: ServiceClient;\n  private _baseURL: string;\n\n  // eslint-disable-next-line @azure/azure-sdk/ts-use-interface-parameters\n  constructor(baseURL: string, client: ServiceClient) {\n    this._client = client;\n    this._baseURL = baseURL;\n  }\n\n  async fetch(path: string, options?: OperationOptions): Promise<DTDL | DTDL[]> {\n    logger.info(`Fetching ${path} from remote endpoint`);\n    if (!options) {\n      options = {};\n    }\n    const myURL = this._baseURL + \"/\" + path;\n    const requestMethod: HttpMethods = \"GET\";\n    const requestHeader: HttpHeaders = createHttpHeaders(options.requestOptions?.customHeaders);\n    const requestOptions = {\n      url: myURL,\n      method: requestMethod,\n      headers: requestHeader,\n      timeout: options.requestOptions?.timeout,\n      abortSignal: options.abortSignal,\n      tracingOptions: options.tracingOptions,\n      allowInsecureConnection: true,\n    };\n    const request: PipelineRequest = createPipelineRequest(requestOptions);\n    const res: PipelineResponse = await this._client.sendRequest(request);\n\n    if (res.status >= 200 && res.status < 400) {\n      const dtdlAsString = res.bodyAsText || \"\";\n      const parsedDtdl: DTDL | DTDL[] = JSON.parse(dtdlAsString);\n      return parsedDtdl;\n    } else {\n      throw new RestError(\"Error on HTTP Request in remote model fetcher\", {\n        code: \"ResourceNotFound\",\n        statusCode: res.status,\n        response: res,\n        request: request,\n      });\n    }\n  }\n}\n"]}
+{"version":3,"file":"fetcherHTTP.js","sourceRoot":"","sources":["../../src/fetcherHTTP.ts"],"names":[],"mappings":";AAAA,uCAAuC;AACvC,kCAAkC;;;AASlC,kEAAgG;AAChG,2CAAqC;AAIrC;;;;;GAKG;AACH,MAAa,WAAW;IACd,OAAO,CAAgB;IACvB,QAAQ,CAAS;IAEzB,wEAAwE;IACxE,YAAY,OAAe,EAAE,MAAqB;QAChD,IAAI,CAAC,OAAO,GAAG,MAAM,CAAC;QACtB,IAAI,CAAC,QAAQ,GAAG,OAAO,CAAC;IAC1B,CAAC;IAED,KAAK,CAAC,KAAK,CAAC,IAAY,EAAE,OAA0B;QAClD,kBAAM,CAAC,IAAI,CAAC,YAAY,IAAI,uBAAuB,CAAC,CAAC;QACrD,IAAI,CAAC,OAAO,EAAE,CAAC;YACb,OAAO,GAAG,EAAE,CAAC;QACf,CAAC;QACD,MAAM,KAAK,GAAG,IAAI,CAAC,QAAQ,GAAG,GAAG,GAAG,IAAI,CAAC;QACzC,MAAM,aAAa,GAAgB,KAAK,CAAC;QACzC,MAAM,aAAa,GAAgB,IAAA,sCAAiB,EAAC,OAAO,CAAC,cAAc,EAAE,aAAa,CAAC,CAAC;QAC5F,MAAM,cAAc,GAAG;YACrB,GAAG,EAAE,KAAK;YACV,MAAM,EAAE,aAAa;YACrB,OAAO,EAAE,aAAa;YACtB,OAAO,EAAE,OAAO,CAAC,cAAc,EAAE,OAAO;YACxC,WAAW,EAAE,OAAO,CAAC,WAAW;YAChC,cAAc,EAAE,OAAO,CAAC,cAAc;YACtC,uBAAuB,EAAE,IAAI;SAC9B,CAAC;QACF,MAAM,OAAO,GAAoB,IAAA,0CAAqB,EAAC,cAAc,CAAC,CAAC;QACvE,MAAM,GAAG,GAAqB,MAAM,IAAI,CAAC,OAAO,CAAC,WAAW,CAAC,OAAO,CAAC,CAAC;QAEtE,IAAI,GAAG,CAAC,MAAM,IAAI,GAAG,IAAI,GAAG,CAAC,MAAM,GAAG,GAAG,EAAE,CAAC;YAC1C,MAAM,YAAY,GAAG,GAAG,CAAC,UAAU,IAAI,EAAE,CAAC;YAC1C,MAAM,UAAU,GAAkB,IAAI,CAAC,KAAK,CAAC,YAAY,CAAC,CAAC;YAC3D,OAAO,UAAU,CAAC;QACpB,CAAC;aAAM,CAAC;YACN,MAAM,IAAI,8BAAS,CAAC,+CAA+C,EAAE;gBACnE,IAAI,EAAE,kBAAkB;gBACxB,UAAU,EAAE,GAAG,CAAC,MAAM;gBACtB,QAAQ,EAAE,GAAG;gBACb,OAAO,EAAE,OAAO;aACjB,CAAC,CAAC;QACL,CAAC;IACH,CAAC;CACF;AA3CD,kCA2CC","sourcesContent":["// Copyright (c) Microsoft Corporation.\n// Licensed under the MIT License.\n\nimport type { OperationOptions, ServiceClient } from \"@azure/core-client\";\nimport type {\n  HttpHeaders,\n  HttpMethods,\n  PipelineRequest,\n  PipelineResponse,\n} from \"@azure/core-rest-pipeline\";\nimport { createHttpHeaders, createPipelineRequest, RestError } from \"@azure/core-rest-pipeline\";\nimport { logger } from \"./logger.js\";\nimport type { Fetcher } from \"./fetcherAbstract.js\";\nimport type { DTDL } from \"./psuedoDtdl.js\";\n\n/**\n * The HTTP Fetcher implements the Fetcher interface to\n * retrieve models through HTTP calls.\n *\n * @internal\n */\nexport class HttpFetcher implements Fetcher {\n  private _client: ServiceClient;\n  private _baseURL: string;\n\n  // eslint-disable-next-line @azure/azure-sdk/ts-use-interface-parameters\n  constructor(baseURL: string, client: ServiceClient) {\n    this._client = client;\n    this._baseURL = baseURL;\n  }\n\n  async fetch(path: string, options?: OperationOptions): Promise<DTDL | DTDL[]> {\n    logger.info(`Fetching ${path} from remote endpoint`);\n    if (!options) {\n      options = {};\n    }\n    const myURL = this._baseURL + \"/\" + path;\n    const requestMethod: HttpMethods = \"GET\";\n    const requestHeader: HttpHeaders = createHttpHeaders(options.requestOptions?.customHeaders);\n    const requestOptions = {\n      url: myURL,\n      method: requestMethod,\n      headers: requestHeader,\n      timeout: options.requestOptions?.timeout,\n      abortSignal: options.abortSignal,\n      tracingOptions: options.tracingOptions,\n      allowInsecureConnection: true,\n    };\n    const request: PipelineRequest = createPipelineRequest(requestOptions);\n    const res: PipelineResponse = await this._client.sendRequest(request);\n\n    if (res.status >= 200 && res.status < 400) {\n      const dtdlAsString = res.bodyAsText || \"\";\n      const parsedDtdl: DTDL | DTDL[] = JSON.parse(dtdlAsString);\n      return parsedDtdl;\n    } else {\n      throw new RestError(\"Error on HTTP Request in remote model fetcher\", {\n        code: \"ResourceNotFound\",\n        statusCode: res.status,\n        response: res,\n        request: request,\n      });\n    }\n  }\n}\n"]}

package/dist/commonjs/modelsRepositoryClient.js

@@ -3,7 +3,6 @@
 // Licensed under the MIT License.
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.ModelsRepositoryClient = void 0;
-const tslib_1 = require("tslib");
 const constants_js_1 = require("./utils/constants.js");
 const core_client_1 = require("@azure/core-client");
 const path_js_1 = require("./utils/path.js");
@@ -17,6 +16,12 @@ const fetcherHTTP_js_1 = require("./fetcherHTTP.js");
  * Initializes a new instance of the IoT Models Repository Client.
  */
 class ModelsRepositoryClient {
+    _repositoryLocation;
+    _dependencyResolution;
+    _apiVersion;
+    _fetcher;
+    _resolver;
+    _pseudoParser;
     /**
      * The ModelsRepositoryClient constructor
      * @param options - The models repository client options that govern the behavior of the client.
@@ -72,7 +77,7 @@ class ModelsRepositoryClient {
      * to create the IoT Models Repository Service Client.
      */
     _createClient(options) {
-        const pipelineOptions = tslib_1.__rest(options, []);
+        const { ...pipelineOptions } = options;
         if (!pipelineOptions.userAgentOptions) {
             pipelineOptions.userAgentOptions = {};
         }
@@ -82,11 +87,14 @@ class ModelsRepositoryClient {
         else {
             pipelineOptions.userAgentOptions.userAgentPrefix = constants_js_1.DEFAULT_USER_AGENT;
         }
-        const internalPipelineOptions = Object.assign(Object.assign({}, pipelineOptions), {
-            loggingOptions: {
-                logger: logger_js_1.logger.info,
+        const internalPipelineOptions = {
+            ...pipelineOptions,
+            ...{
+                loggingOptions: {
+                    logger: logger_js_1.logger.info,
+                },
             },
-        });
+        };
         const pipeline = (0, core_client_1.createClientPipeline)(internalPipelineOptions);
         const client = new modelsRepositoryServiceClient_js_1.IoTModelsRepositoryServiceClient(this._repositoryLocation, { pipeline });
         return client;
@@ -136,7 +144,7 @@ class ModelsRepositoryClient {
         if (!Array.isArray(dtmis)) {
             dtmis = [dtmis];
         }
-        const dependencyResolution = (options === null || options === void 0 ? void 0 : options.dependencyResolution) || this._dependencyResolution;
+        const dependencyResolution = options?.dependencyResolution || this._dependencyResolution;
         if (dependencyResolution === constants_js_1.DEPENDENCY_MODE_DISABLED) {
             logger_js_1.logger.info("Getting models w/ dependency resolution mode: disabled");
             logger_js_1.logger.info(`Retreiving model(s): ${dtmis}...`);

package/dist/commonjs/modelsRepositoryClient.js.map

@@ -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"]}
+{"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"]}

package/dist/commonjs/modelsRepositoryServiceClient.js

@@ -9,6 +9,8 @@ const constants_js_1 = require("./utils/constants.js");
  * @internal
  */
 class IoTModelsRepositoryServiceClient extends core_client_1.ServiceClient {
+    url;
+    version;
     /**
      * Initializes a new instance of the IoTModelsRepositoryServiceClient class.
      *
@@ -20,7 +22,10 @@ class IoTModelsRepositoryServiceClient extends core_client_1.ServiceClient {
             baseUri: `${url}`,
             requestContentType: "application/json; charset=utf-8",
         };
-        const optionsWithDefaults = Object.assign(Object.assign({}, defaults), options);
+        const optionsWithDefaults = {
+            ...defaults,
+            ...options,
+        };
         super(optionsWithDefaults);
         this.url = url;
         this.version = options.version || constants_js_1.DEFAULT_API_VERSION;

package/dist/commonjs/modelsRepositoryServiceClient.js.map

@@ -1 +1 @@
-{"version":3,"file":"modelsRepositoryServiceClient.js","sourceRoot":"","sources":["../../src/modelsRepositoryServiceClient.ts"],"names":[],"mappings":";AAAA,uCAAuC;AACvC,kCAAkC;;;AAGlC,oDAAmD;AACnD,uDAA2D;AAS3D;;GAEG;AACH,MAAa,gCAAiC,SAAQ,2BAAa;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,kCAAmB,CAAC;IACxD,CAAC;CACF;AA1BD,4EA0BC","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"]}
+{"version":3,"file":"modelsRepositoryServiceClient.js","sourceRoot":"","sources":["../../src/modelsRepositoryServiceClient.ts"],"names":[],"mappings":";AAAA,uCAAuC;AACvC,kCAAkC;;;AAGlC,oDAAmD;AACnD,uDAA2D;AAS3D;;GAEG;AACH,MAAa,gCAAiC,SAAQ,2BAAa;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,kCAAmB,CAAC;IACxD,CAAC;CACF;AA1BD,4EA0BC","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"]}

package/dist/commonjs/psuedoParser.js

@@ -17,6 +17,7 @@ const core_rest_pipeline_1 = require("@azure/core-rest-pipeline");
  * @internal
  */
 class PseudoParser {
+    _resolver;
     // eslint-disable-next-line @azure/azure-sdk/ts-use-interface-parameters
     constructor(resolver) {
         this._resolver = resolver;