@looker/api-explorer 0.9.26 → 0.9.29

package/lib/utils/apixAdaptor.js

@@ -0,0 +1,67 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.ApixAdaptor = exports.getApixAdaptor = void 0;
+
+var _extensionUtils = require("@looker/extension-utils");
+
+var _sdkCodegen = require("@looker/sdk-codegen");
+
+var _runIt = require("@looker/run-it");
+
+var _cloneDeep = _interopRequireDefault(require("lodash/cloneDeep"));
+
+var _adaptorUtils = require("./adaptorUtils");
+
+function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
+
+function asyncGeneratorStep(gen, resolve, reject, _next, _throw, key, arg) { try { var info = gen[key](arg); var value = info.value; } catch (error) { reject(error); return; } if (info.done) { resolve(value); } else { Promise.resolve(value).then(_next, _throw); } }
+
+function _asyncToGenerator(fn) { return function () { var self = this, args = arguments; return new Promise(function (resolve, reject) { var gen = fn.apply(self, args); function _next(value) { asyncGeneratorStep(gen, resolve, reject, _next, _throw, "next", value); } function _throw(err) { asyncGeneratorStep(gen, resolve, reject, _next, _throw, "throw", err); } _next(undefined); }); }; }
+
+var getApixAdaptor = () => (0, _extensionUtils.getEnvAdaptor)();
+
+exports.getApixAdaptor = getApixAdaptor;
+
+class ApixAdaptor extends _extensionUtils.BrowserAdaptor {
+  constructor(sdk, fallbackVersionsUrl) {
+    super(sdk);
+    this.fallbackVersionsUrl = fallbackVersionsUrl;
+  }
+
+  fetchSpecList(versionsUrl) {
+    var _this = this;
+
+    return _asyncToGenerator(function* () {
+      var data = yield _this.localStorageGetItem(_runIt.RunItConfigKey);
+      var config = data ? JSON.parse(data) : _runIt.RunItNoConfig;
+      var url;
+
+      if (versionsUrl) {
+        url = versionsUrl;
+      } else {
+        url = config.base_url ? "".concat(config.base_url, "/versions") : "".concat(_this.fallbackVersionsUrl, "/versions.json");
+      }
+
+      var versions = yield _this.sdk.authSession.transport.rawRequest('GET', url);
+      var specs = yield (0, _sdkCodegen.getSpecsFromVersions)(JSON.parse(versions.body));
+      return specs;
+    })();
+  }
+
+  fetchSpec(spec) {
+    return _asyncToGenerator(function* () {
+      var _spec = (0, _cloneDeep.default)(spec);
+
+      _spec.specURL = (0, _adaptorUtils.fullify)(spec.specURL, origin);
+      _spec.api = yield (0, _adaptorUtils.fallbackFetch)(_spec, _adaptorUtils.funFetch);
+      return _spec;
+    })();
+  }
+
+}
+
+exports.ApixAdaptor = ApixAdaptor;
+//# sourceMappingURL=apixAdaptor.js.map

package/lib/utils/apixAdaptor.js.map

@@ -0,0 +1 @@
+{"version":3,"sources":["../../src/utils/apixAdaptor.ts"],"names":["getApixAdaptor","ApixAdaptor","BrowserAdaptor","constructor","sdk","fallbackVersionsUrl","fetchSpecList","versionsUrl","data","localStorageGetItem","RunItConfigKey","config","JSON","parse","RunItNoConfig","url","base_url","versions","authSession","transport","rawRequest","specs","body","fetchSpec","spec","_spec","specURL","origin","api","funFetch"],"mappings":";;;;;;;AA0BA;;AAGA;;AACA;;AACA;;AAEA;;;;;;;;AAOO,IAAMA,cAAc,GAAG,MAAM,oCAA7B;;;;AAEA,MAAMC,WAAN,SAA0BC,8BAA1B,CAAiE;AACtEC,EAAAA,WAAW,CAACC,GAAD,EAAoCC,mBAApC,EAAiE;AAC1E,UAAMD,GAAN;AAD0E,SAA7BC,mBAA6B,GAA7BA,mBAA6B;AAE3E;;AAEKC,EAAAA,aAAa,CAACC,WAAD,EAA0C;AAAA;;AAAA;AAC3D,UAAMC,IAAI,SAAS,KAAI,CAACC,mBAAL,CAAyBC,qBAAzB,CAAnB;AACA,UAAMC,MAAM,GAAGH,IAAI,GAAGI,IAAI,CAACC,KAAL,CAAWL,IAAX,CAAH,GAAsBM,oBAAzC;AACA,UAAIC,GAAJ;;AAEA,UAAIR,WAAJ,EAAiB;AACfQ,QAAAA,GAAG,GAAGR,WAAN;AACD,OAFD,MAEO;AACLQ,QAAAA,GAAG,GAAGJ,MAAM,CAACK,QAAP,aACCL,MAAM,CAACK,QADR,2BAEC,KAAI,CAACX,mBAFN,mBAAN;AAGD;;AAED,UAAMY,QAAQ,SAAS,KAAI,CAACb,GAAL,CAASc,WAAT,CAAqBC,SAArB,CAA+BC,UAA/B,CAA0C,KAA1C,EAAiDL,GAAjD,CAAvB;AACA,UAAMM,KAAK,SAAS,sCAAqBT,IAAI,CAACC,KAAL,CAAWI,QAAQ,CAACK,IAApB,CAArB,CAApB;AACA,aAAOD,KAAP;AAf2D;AAgB5D;;AAEKE,EAAAA,SAAS,CAACC,IAAD,EAAoC;AAAA;AACjD,UAAMC,KAAK,GAAG,wBAAUD,IAAV,CAAd;;AACAC,MAAAA,KAAK,CAACC,OAAN,GAAgB,2BAAQF,IAAI,CAACE,OAAb,EAAuBC,MAAvB,CAAhB;AACAF,MAAAA,KAAK,CAACG,GAAN,SAAkB,iCAAcH,KAAd,EAAqBI,sBAArB,CAAlB;AACA,aAAOJ,KAAP;AAJiD;AAKlD;;AA5BqE","sourcesContent":["/*\n\n MIT License\n\n Copyright (c) 2021 Looker Data Sciences, Inc.\n\n Permission is hereby granted, free of charge, to any person obtaining a copy\n of this software and associated documentation files (the \"Software\"), to deal\n in the Software without restriction, including without limitation the rights\n to use, copy, modify, merge, publish, distribute, sublicense, and/or sell\n copies of the Software, and to permit persons to whom the Software is\n furnished to do so, subject to the following conditions:\n\n The above copyright notice and this permission notice shall be included in all\n copies or substantial portions of the Software.\n\n THE SOFTWARE IS PROVIDED \"AS IS\", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR\n IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,\n FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE\n AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER\n LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,\n OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE\n SOFTWARE.\n\n */\nimport type { IEnvironmentAdaptor } from '@looker/extension-utils'\nimport { BrowserAdaptor, getEnvAdaptor } from '@looker/extension-utils'\nimport type { IAPIMethods } from '@looker/sdk-rtl'\nimport type { SpecItem, SpecList } from '@looker/sdk-codegen'\nimport { getSpecsFromVersions } from '@looker/sdk-codegen'\nimport { RunItConfigKey, RunItNoConfig } from '@looker/run-it'\nimport cloneDeep from 'lodash/cloneDeep'\n\nimport { fullify, fallbackFetch, funFetch } from './adaptorUtils'\n\nexport interface IApixAdaptor extends IEnvironmentAdaptor {\n  fetchSpecList(versionsUrl?: string): Promise<SpecList>\n  fetchSpec(spec: SpecItem): Promise<SpecItem>\n}\n\nexport const getApixAdaptor = () => getEnvAdaptor() as IApixAdaptor\n\nexport class ApixAdaptor extends BrowserAdaptor implements IApixAdaptor {\n  constructor(sdk: IAPIMethods, private readonly fallbackVersionsUrl: string) {\n    super(sdk)\n  }\n\n  async fetchSpecList(versionsUrl?: string): Promise<SpecList> {\n    const data = await this.localStorageGetItem(RunItConfigKey)\n    const config = data ? JSON.parse(data) : RunItNoConfig\n    let url: string\n\n    if (versionsUrl) {\n      url = versionsUrl\n    } else {\n      url = config.base_url\n        ? `${config.base_url}/versions`\n        : `${this.fallbackVersionsUrl}/versions.json`\n    }\n\n    const versions = await this.sdk.authSession.transport.rawRequest('GET', url)\n    const specs = await getSpecsFromVersions(JSON.parse(versions.body))\n    return specs\n  }\n\n  async fetchSpec(spec: SpecItem): Promise<SpecItem> {\n    const _spec = cloneDeep(spec)\n    _spec.specURL = fullify(spec.specURL!, origin)\n    _spec.api = await fallbackFetch(_spec, funFetch)\n    return _spec\n  }\n}\n"],"file":"apixAdaptor.js"}

package/lib/utils/index.d.ts

@@ -1,4 +1,6 @@
 export { highlightHTML } from './highlight';
-export { buildPath, buildMethodPath, buildTypePath, diffPath, oAuthPath, } from './path';
+export * from './path';
 export { getLoded } from './lodeUtils';
 export { useWindowSize } from './useWindowSize';
+export * from './apixAdaptor';
+export * from './adaptorUtils';

package/lib/utils/index.js

@@ -3,42 +3,17 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
+var _exportNames = {
+  highlightHTML: true,
+  getLoded: true,
+  useWindowSize: true
+};
 Object.defineProperty(exports, "highlightHTML", {
   enumerable: true,
   get: function get() {
     return _highlight.highlightHTML;
   }
 });
-Object.defineProperty(exports, "buildPath", {
-  enumerable: true,
-  get: function get() {
-    return _path.buildPath;
-  }
-});
-Object.defineProperty(exports, "buildMethodPath", {
-  enumerable: true,
-  get: function get() {
-    return _path.buildMethodPath;
-  }
-});
-Object.defineProperty(exports, "buildTypePath", {
-  enumerable: true,
-  get: function get() {
-    return _path.buildTypePath;
-  }
-});
-Object.defineProperty(exports, "diffPath", {
-  enumerable: true,
-  get: function get() {
-    return _path.diffPath;
-  }
-});
-Object.defineProperty(exports, "oAuthPath", {
-  enumerable: true,
-  get: function get() {
-    return _path.oAuthPath;
-  }
-});
 Object.defineProperty(exports, "getLoded", {
   enumerable: true,
   get: function get() {
@@ -56,7 +31,47 @@ var _highlight = require("./highlight");
 
 var _path = require("./path");
 
+Object.keys(_path).forEach(function (key) {
+  if (key === "default" || key === "__esModule") return;
+  if (Object.prototype.hasOwnProperty.call(_exportNames, key)) return;
+  if (key in exports && exports[key] === _path[key]) return;
+  Object.defineProperty(exports, key, {
+    enumerable: true,
+    get: function get() {
+      return _path[key];
+    }
+  });
+});
+
 var _lodeUtils = require("./lodeUtils");
 
 var _useWindowSize = require("./useWindowSize");
+
+var _apixAdaptor = require("./apixAdaptor");
+
+Object.keys(_apixAdaptor).forEach(function (key) {
+  if (key === "default" || key === "__esModule") return;
+  if (Object.prototype.hasOwnProperty.call(_exportNames, key)) return;
+  if (key in exports && exports[key] === _apixAdaptor[key]) return;
+  Object.defineProperty(exports, key, {
+    enumerable: true,
+    get: function get() {
+      return _apixAdaptor[key];
+    }
+  });
+});
+
+var _adaptorUtils = require("./adaptorUtils");
+
+Object.keys(_adaptorUtils).forEach(function (key) {
+  if (key === "default" || key === "__esModule") return;
+  if (Object.prototype.hasOwnProperty.call(_exportNames, key)) return;
+  if (key in exports && exports[key] === _adaptorUtils[key]) return;
+  Object.defineProperty(exports, key, {
+    enumerable: true,
+    get: function get() {
+      return _adaptorUtils[key];
+    }
+  });
+});
 //# sourceMappingURL=index.js.map

package/lib/utils/index.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../../src/utils/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAyBA;;AACA;;AAOA;;AACA","sourcesContent":["/*\n\n MIT License\n\n Copyright (c) 2021 Looker Data Sciences, Inc.\n\n Permission is hereby granted, free of charge, to any person obtaining a copy\n of this software and associated documentation files (the \"Software\"), to deal\n in the Software without restriction, including without limitation the rights\n to use, copy, modify, merge, publish, distribute, sublicense, and/or sell\n copies of the Software, and to permit persons to whom the Software is\n furnished to do so, subject to the following conditions:\n\n The above copyright notice and this permission notice shall be included in all\n copies or substantial portions of the Software.\n\n THE SOFTWARE IS PROVIDED \"AS IS\", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR\n IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,\n FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE\n AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER\n LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,\n OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE\n SOFTWARE.\n\n */\nexport { highlightHTML } from './highlight'\nexport {\n  buildPath,\n  buildMethodPath,\n  buildTypePath,\n  diffPath,\n  oAuthPath,\n} from './path'\nexport { getLoded } from './lodeUtils'\nexport { useWindowSize } from './useWindowSize'\n"],"file":"index.js"}
+{"version":3,"sources":["../../src/utils/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAyBA;;AACA;;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;;AACA;;AACA;;AACA;;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;;AACA;;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA","sourcesContent":["/*\n\n MIT License\n\n Copyright (c) 2021 Looker Data Sciences, Inc.\n\n Permission is hereby granted, free of charge, to any person obtaining a copy\n of this software and associated documentation files (the \"Software\"), to deal\n in the Software without restriction, including without limitation the rights\n to use, copy, modify, merge, publish, distribute, sublicense, and/or sell\n copies of the Software, and to permit persons to whom the Software is\n furnished to do so, subject to the following conditions:\n\n The above copyright notice and this permission notice shall be included in all\n copies or substantial portions of the Software.\n\n THE SOFTWARE IS PROVIDED \"AS IS\", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR\n IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,\n FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE\n AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER\n LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,\n OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE\n SOFTWARE.\n\n */\nexport { highlightHTML } from './highlight'\nexport * from './path'\nexport { getLoded } from './lodeUtils'\nexport { useWindowSize } from './useWindowSize'\nexport * from './apixAdaptor'\nexport * from './adaptorUtils'\n"],"file":"index.js"}

package/lib/utils/path.d.ts

@@ -1,6 +1,9 @@
 import type { ApiModel, IMethod, IType } from '@looker/sdk-codegen';
+import type { Location as HLocation } from 'history';
 export declare const buildMethodPath: (specKey: string, tag: string, methodName: string) => string;
 export declare const buildTypePath: (specKey: string, tag: string, typeName: string) => string;
 export declare const diffPath = "diff";
 export declare const oAuthPath = "oauth";
+export declare const isMethod: (item: IMethod | IType) => boolean;
 export declare const buildPath: (api: ApiModel, item: IMethod | IType, specKey: string) => string;
+export declare const getSpecKey: (location: HLocation | Location) => string | null;

package/lib/utils/path.js

@@ -3,10 +3,16 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.buildPath = exports.oAuthPath = exports.diffPath = exports.buildTypePath = exports.buildMethodPath = void 0;
+exports.getSpecKey = exports.buildPath = exports.isMethod = exports.oAuthPath = exports.diffPath = exports.buildTypePath = exports.buildMethodPath = void 0;
 
 var _sdkCodegen = require("@looker/sdk-codegen");
 
+function _wrapRegExp() { _wrapRegExp = function _wrapRegExp(re, groups) { return new BabelRegExp(re, undefined, groups); }; var _super = RegExp.prototype; var _groups = new WeakMap(); function BabelRegExp(re, flags, groups) { var _this = new RegExp(re, flags); _groups.set(_this, groups || _groups.get(re)); return _setPrototypeOf(_this, BabelRegExp.prototype); } _inherits(BabelRegExp, RegExp); BabelRegExp.prototype.exec = function (str) { var result = _super.exec.call(this, str); if (result) result.groups = buildGroups(result, this); return result; }; BabelRegExp.prototype[Symbol.replace] = function (str, substitution) { if (typeof substitution === "string") { var groups = _groups.get(this); return _super[Symbol.replace].call(this, str, substitution.replace(/\$<([^>]+)>/g, function (_, name) { return "$" + groups[name]; })); } else if (typeof substitution === "function") { var _this = this; return _super[Symbol.replace].call(this, str, function () { var args = arguments; if (typeof args[args.length - 1] !== "object") { args = [].slice.call(args); args.push(buildGroups(args, _this)); } return substitution.apply(this, args); }); } else { return _super[Symbol.replace].call(this, str, substitution); } }; function buildGroups(result, re) { var g = _groups.get(re); return Object.keys(g).reduce(function (groups, name) { groups[name] = result[g[name]]; return groups; }, Object.create(null)); } return _wrapRegExp.apply(this, arguments); }
+
+function _inherits(subClass, superClass) { if (typeof superClass !== "function" && superClass !== null) { throw new TypeError("Super expression must either be null or a function"); } subClass.prototype = Object.create(superClass && superClass.prototype, { constructor: { value: subClass, writable: true, configurable: true } }); if (superClass) _setPrototypeOf(subClass, superClass); }
+
+function _setPrototypeOf(o, p) { _setPrototypeOf = Object.setPrototypeOf || function _setPrototypeOf(o, p) { o.__proto__ = p; return o; }; return _setPrototypeOf(o, p); }
+
 var buildMethodPath = (specKey, tag, methodName) => "/".concat(specKey, "/methods/").concat(tag, "/").concat(methodName);
 
 exports.buildMethodPath = buildMethodPath;
@@ -29,6 +35,10 @@ var getMethodTag = (api, methodName) => {
   })[0];
 };
 
+var isMethod = item => 'params' in item;
+
+exports.isMethod = isMethod;
+
 var getTypeTag = (api, type) => {
   var method = (0, _sdkCodegen.firstMethodRef)(api, type);
   return getMethodTag(api, method.name);
@@ -37,7 +47,7 @@ var getTypeTag = (api, type) => {
 var buildPath = (api, item, specKey) => {
   var path;
 
-  if (item instanceof _sdkCodegen.Method) {
+  if (isMethod(item)) {
     var tag = getMethodTag(api, item.name);
     path = buildMethodPath(specKey, tag, item.name);
   } else {
@@ -50,4 +60,24 @@ var buildPath = (api, item, specKey) => {
 };
 
 exports.buildPath = buildPath;
+
+var getSpecKey = location => {
+  var _match, _match$groups;
+
+  var pathname = location.pathname;
+  var match;
+
+  if (pathname.startsWith("/".concat(diffPath))) {
+    var pattern = new RegExp("(?:/".concat(diffPath, ")/(?<specKey>\\w+.\\w+)"));
+    match = pathname.match(pattern);
+  } else {
+    match = pathname.match(_wrapRegExp(/\/([0-9A-Z_a-z]+\.[0-9A-Z_a-z]+).*/, {
+      specKey: 1
+    }));
+  }
+
+  return ((_match = match) === null || _match === void 0 ? void 0 : (_match$groups = _match.groups) === null || _match$groups === void 0 ? void 0 : _match$groups.specKey) || null;
+};
+
+exports.getSpecKey = getSpecKey;
 //# sourceMappingURL=path.js.map

package/lib/utils/path.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../../src/utils/path.ts"],"names":["buildMethodPath","specKey","tag","methodName","buildTypePath","typeName","diffPath","oAuthPath","getMethodTag","api","Object","entries","tags","filter","methods","map","methodTag","getTypeTag","type","method","name","buildPath","item","path","Method"],"mappings":";;;;;;;AA2BA;;AASO,IAAMA,eAAe,GAAG,CAC7BC,OAD6B,EAE7BC,GAF6B,EAG7BC,UAH6B,gBAItBF,OAJsB,sBAIHC,GAJG,cAIIC,UAJJ,CAAxB;;;;AAaA,IAAMC,aAAa,GAAG,CAACH,OAAD,EAAkBC,GAAlB,EAA+BG,QAA/B,gBACvBJ,OADuB,oBACNC,GADM,cACCG,QADD,CAAtB;;;AAGA,IAAMC,QAAQ,GAAG,MAAjB;;AACA,IAAMC,SAAS,GAAG,OAAlB;;;AAQP,IAAMC,YAAY,GAAG,CAACC,GAAD,EAAgBN,UAAhB,KAAuC;AAE1D,SAAOO,MAAM,CAACC,OAAP,CAAeF,GAAG,CAACG,IAAnB,EACJC,MADI,CACG;AAAA,QAAC,GAAGC,OAAH,CAAD;AAAA,WAAiBX,UAAU,IAAIW,OAA/B;AAAA,GADH,EAEJC,GAFI,CAEA;AAAA,QAAC,CAACC,SAAD,CAAD;AAAA,WAAiBA,SAAjB;AAAA,GAFA,EAE4B,CAF5B,CAAP;AAGD,CALD;;AAYA,IAAMC,UAAU,GAAG,CAACR,GAAD,EAAgBS,IAAhB,KAAgC;AACjD,MAAMC,MAAM,GAAG,gCAAeV,GAAf,EAAoBS,IAApB,CAAf;AACA,SAAOV,YAAY,CAACC,GAAD,EAAMU,MAAM,CAACC,IAAb,CAAnB;AACD,CAHD;;AAYO,IAAMC,SAAS,GAAG,CACvBZ,GADuB,EAEvBa,IAFuB,EAGvBrB,OAHuB,KAIpB;AACH,MAAIsB,IAAJ;;AACA,MAAID,IAAI,YAAYE,kBAApB,EAA4B;AAC1B,QAAMtB,GAAG,GAAGM,YAAY,CAACC,GAAD,EAAMa,IAAI,CAACF,IAAX,CAAxB;AACAG,IAAAA,IAAI,GAAGvB,eAAe,CAACC,OAAD,EAAUC,GAAV,EAAeoB,IAAI,CAACF,IAApB,CAAtB;AACD,GAHD,MAGO;AACL,QAAMlB,IAAG,GAAGe,UAAU,CAACR,GAAD,EAAMa,IAAN,CAAtB;;AACAC,IAAAA,IAAI,GAAGnB,aAAa,CAACH,OAAD,EAAUC,IAAV,EAAeoB,IAAI,CAACF,IAApB,CAApB;AACD;;AACD,SAAOG,IAAP;AACD,CAdM","sourcesContent":["/*\n\n MIT License\n\n Copyright (c) 2021 Looker Data Sciences, Inc.\n\n Permission is hereby granted, free of charge, to any person obtaining a copy\n of this software and associated documentation files (the \"Software\"), to deal\n in the Software without restriction, including without limitation the rights\n to use, copy, modify, merge, publish, distribute, sublicense, and/or sell\n copies of the Software, and to permit persons to whom the Software is\n furnished to do so, subject to the following conditions:\n\n The above copyright notice and this permission notice shall be included in all\n copies or substantial portions of the Software.\n\n THE SOFTWARE IS PROVIDED \"AS IS\", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR\n IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,\n FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE\n AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER\n LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,\n OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE\n SOFTWARE.\n\n */\n\nimport type { ApiModel, IMethod, IType } from '@looker/sdk-codegen'\nimport { firstMethodRef, Method } from '@looker/sdk-codegen'\n\n/**\n * Builds a path matching the route used by MethodScene\n * @param specKey A string to identify the spec in the URL\n * @param tag Corresponding method tag\n * @param methodName A method name\n * @returns a Method path\n */\nexport const buildMethodPath = (\n  specKey: string,\n  tag: string,\n  methodName: string\n) => `/${specKey}/methods/${tag}/${methodName}`\n\n/**\n * Builds a path matching the route used by TypeScene\n * @param specKey A string to identify the spec in the URL\n * @param tag Corresponding type tag\n * @param typeName A type name\n * @returns a Type path\n */\nexport const buildTypePath = (specKey: string, tag: string, typeName: string) =>\n  `/${specKey}/types/${tag}/${typeName}`\n\nexport const diffPath = 'diff'\nexport const oAuthPath = 'oauth'\n\n/**\n * Returns the tag for a given method name\n * @param api Parsed api\n * @param methodName SDK method name\n * @returns Corresponding tag\n */\nconst getMethodTag = (api: ApiModel, methodName: string) => {\n  // Find tag containing methodName\n  return Object.entries(api.tags)\n    .filter(([, methods]) => methodName in methods)\n    .map(([methodTag]) => methodTag)[0]\n}\n\n/**\n * Return the tag for a give type\n * @param api Parsed api\n * @param type to tag\n */\nconst getTypeTag = (api: ApiModel, type: IType) => {\n  const method = firstMethodRef(api, type)\n  return getMethodTag(api, method.name)\n}\n\n/**\n * Builds a path matching MethodScene or TypeScene route\n * @param api parsed api\n * @param item A method or type item\n * @param specKey A string to identify the spec in the url\n * @returns a method or type path\n */\nexport const buildPath = (\n  api: ApiModel,\n  item: IMethod | IType,\n  specKey: string\n) => {\n  let path\n  if (item instanceof Method) {\n    const tag = getMethodTag(api, item.name)\n    path = buildMethodPath(specKey, tag, item.name)\n  } else {\n    const tag = getTypeTag(api, item as IType)\n    path = buildTypePath(specKey, tag, item.name)\n  }\n  return path\n}\n"],"file":"path.js"}
+{"version":3,"sources":["../../src/utils/path.ts"],"names":["buildMethodPath","specKey","tag","methodName","buildTypePath","typeName","diffPath","oAuthPath","getMethodTag","api","Object","entries","tags","filter","methods","map","methodTag","isMethod","item","getTypeTag","type","method","name","buildPath","path","getSpecKey","location","pathname","match","startsWith","pattern","RegExp","groups"],"mappings":";;;;;;;AA2BA;;;;;;;;AAUO,IAAMA,eAAe,GAAG,CAC7BC,OAD6B,EAE7BC,GAF6B,EAG7BC,UAH6B,gBAItBF,OAJsB,sBAIHC,GAJG,cAIIC,UAJJ,CAAxB;;;;AAaA,IAAMC,aAAa,GAAG,CAACH,OAAD,EAAkBC,GAAlB,EAA+BG,QAA/B,gBACvBJ,OADuB,oBACNC,GADM,cACCG,QADD,CAAtB;;;AAGA,IAAMC,QAAQ,GAAG,MAAjB;;AACA,IAAMC,SAAS,GAAG,OAAlB;;;AAQP,IAAMC,YAAY,GAAG,CAACC,GAAD,EAAgBN,UAAhB,KAAuC;AAE1D,SAAOO,MAAM,CAACC,OAAP,CAAeF,GAAG,CAACG,IAAnB,EACJC,MADI,CACG;AAAA,QAAC,GAAGC,OAAH,CAAD;AAAA,WAAiBX,UAAU,IAAIW,OAA/B;AAAA,GADH,EAEJC,GAFI,CAEA;AAAA,QAAC,CAACC,SAAD,CAAD;AAAA,WAAiBA,SAAjB;AAAA,GAFA,EAE4B,CAF5B,CAAP;AAGD,CALD;;AAWO,IAAMC,QAAQ,GAAIC,IAAD,IAA2B,YAAYA,IAAxD;;;;AAOP,IAAMC,UAAU,GAAG,CAACV,GAAD,EAAgBW,IAAhB,KAAgC;AACjD,MAAMC,MAAM,GAAG,gCAAeZ,GAAf,EAAoBW,IAApB,CAAf;AACA,SAAOZ,YAAY,CAACC,GAAD,EAAMY,MAAM,CAACC,IAAb,CAAnB;AACD,CAHD;;AAYO,IAAMC,SAAS,GAAG,CACvBd,GADuB,EAEvBS,IAFuB,EAGvBjB,OAHuB,KAIpB;AACH,MAAIuB,IAAJ;;AACA,MAAIP,QAAQ,CAACC,IAAD,CAAZ,EAAoB;AAClB,QAAMhB,GAAG,GAAGM,YAAY,CAACC,GAAD,EAAMS,IAAI,CAACI,IAAX,CAAxB;AACAE,IAAAA,IAAI,GAAGxB,eAAe,CAACC,OAAD,EAAUC,GAAV,EAAegB,IAAI,CAACI,IAApB,CAAtB;AACD,GAHD,MAGO;AACL,QAAMpB,IAAG,GAAGiB,UAAU,CAACV,GAAD,EAAMS,IAAN,CAAtB;;AACAM,IAAAA,IAAI,GAAGpB,aAAa,CAACH,OAAD,EAAUC,IAAV,EAAegB,IAAI,CAACI,IAApB,CAApB;AACD;;AACD,SAAOE,IAAP;AACD,CAdM;;;;AAoBA,IAAMC,UAAU,GAAIC,QAAD,IAAmD;AAAA;;AAC3E,MAAMC,QAAQ,GAAGD,QAAQ,CAACC,QAA1B;AACA,MAAIC,KAAJ;;AACA,MAAID,QAAQ,CAACE,UAAT,YAAwBvB,QAAxB,EAAJ,EAAyC;AACvC,QAAMwB,OAAO,GAAG,IAAIC,MAAJ,eAAkBzB,QAAlB,6BAAhB;AACAsB,IAAAA,KAAK,GAAGD,QAAQ,CAACC,KAAT,CAAeE,OAAf,CAAR;AACD,GAHD,MAGO;AACLF,IAAAA,KAAK,GAAGD,QAAQ,CAACC,KAAT,aAAe,oCAAf;AAAA;AAAA,OAAR;AACD;;AACD,SAAO,WAAAA,KAAK,UAAL,yDAAOI,MAAP,gEAAe/B,OAAf,KAA0B,IAAjC;AACD,CAVM","sourcesContent":["/*\n\n MIT License\n\n Copyright (c) 2021 Looker Data Sciences, Inc.\n\n Permission is hereby granted, free of charge, to any person obtaining a copy\n of this software and associated documentation files (the \"Software\"), to deal\n in the Software without restriction, including without limitation the rights\n to use, copy, modify, merge, publish, distribute, sublicense, and/or sell\n copies of the Software, and to permit persons to whom the Software is\n furnished to do so, subject to the following conditions:\n\n The above copyright notice and this permission notice shall be included in all\n copies or substantial portions of the Software.\n\n THE SOFTWARE IS PROVIDED \"AS IS\", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR\n IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,\n FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE\n AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER\n LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,\n OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE\n SOFTWARE.\n\n */\n\nimport type { ApiModel, IMethod, IType } from '@looker/sdk-codegen'\nimport { firstMethodRef } from '@looker/sdk-codegen'\nimport type { Location as HLocation } from 'history'\n\n/**\n * Builds a path matching the route used by MethodScene\n * @param specKey A string to identify the spec in the URL\n * @param tag Corresponding method tag\n * @param methodName A method name\n * @returns a Method path\n */\nexport const buildMethodPath = (\n  specKey: string,\n  tag: string,\n  methodName: string\n) => `/${specKey}/methods/${tag}/${methodName}`\n\n/**\n * Builds a path matching the route used by TypeScene\n * @param specKey A string to identify the spec in the URL\n * @param tag Corresponding type tag\n * @param typeName A type name\n * @returns a Type path\n */\nexport const buildTypePath = (specKey: string, tag: string, typeName: string) =>\n  `/${specKey}/types/${tag}/${typeName}`\n\nexport const diffPath = 'diff'\nexport const oAuthPath = 'oauth'\n\n/**\n * Returns the tag for a given method name\n * @param api Parsed api\n * @param methodName SDK method name\n * @returns Corresponding tag\n */\nconst getMethodTag = (api: ApiModel, methodName: string) => {\n  // Find tag containing methodName\n  return Object.entries(api.tags)\n    .filter(([, methods]) => methodName in methods)\n    .map(([methodTag]) => methodTag)[0]\n}\n\n/**\n * Is this item a method? Check without requiring `instanceof Method`\n * @param item to check for method or type\n */\nexport const isMethod = (item: IMethod | IType) => 'params' in item\n\n/**\n * Return the tag for a give type\n * @param api Parsed api\n * @param type to tag\n */\nconst getTypeTag = (api: ApiModel, type: IType) => {\n  const method = firstMethodRef(api, type)\n  return getMethodTag(api, method.name)\n}\n\n/**\n * Builds a path matching MethodScene or TypeScene route\n * @param api parsed api\n * @param item A method or type item\n * @param specKey A string to identify the spec in the url\n * @returns a method or type path\n */\nexport const buildPath = (\n  api: ApiModel,\n  item: IMethod | IType,\n  specKey: string\n) => {\n  let path\n  if (isMethod(item)) {\n    const tag = getMethodTag(api, item.name)\n    path = buildMethodPath(specKey, tag, item.name)\n  } else {\n    const tag = getTypeTag(api, item as IType)\n    path = buildTypePath(specKey, tag, item.name)\n  }\n  return path\n}\n\n/**\n * Determine API specification keys from URL pattern\n * @param location service to examine\n */\nexport const getSpecKey = (location: HLocation | Location): string | null => {\n  const pathname = location.pathname\n  let match\n  if (pathname.startsWith(`/${diffPath}`)) {\n    const pattern = new RegExp(`(?:/${diffPath})/(?<specKey>\\\\w+.\\\\w+)`)\n    match = pathname.match(pattern)\n  } else {\n    match = pathname.match(/\\/(?<specKey>\\w+\\.\\w+).*/)\n  }\n  return match?.groups?.specKey || null\n}\n"],"file":"path.js"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@looker/api-explorer",
-  "version": "0.9.26",
+  "version": "0.9.29",
   "description": "Looker API Explorer",
   "main": "lib/index.js",
   "module": "lib/esm/index.js",
@@ -33,8 +33,8 @@
   },
   "devDependencies": {
     "@looker/components-test-utils": "^1.5.5",
-    "@looker/sdk-codegen-scripts": "^21.2.1",
-    "@looker/sdk-node": "^21.20.0",
+    "@looker/sdk-codegen-scripts": "^21.3.0",
+    "@looker/sdk-node": "^22.2.0",
     "@styled-icons/styled-icon": "^10.6.3",
     "@testing-library/jest-dom": "^5.11.6",
     "@testing-library/react": "^11.2.2",
@@ -67,17 +67,17 @@
     "webpack-merge": "^5.7.3"
   },
   "dependencies": {
-    "@looker/code-editor": "^0.1.17",
+    "@looker/code-editor": "^0.1.19",
     "@looker/components": "^2.8.1",
     "@looker/components-date": "^2.4.1",
     "@looker/design-tokens": "^2.7.1",
-    "@looker/extension-utils": "^0.1.3",
+    "@looker/extension-utils": "^0.1.6",
     "@looker/icons": "^1.5.3",
     "@looker/redux": "0.0.0",
-    "@looker/run-it": "^0.9.26",
-    "@looker/sdk": "^21.20.0",
-    "@looker/sdk-codegen": "^21.3.1",
-    "@looker/sdk-rtl": "^21.3.1",
+    "@looker/run-it": "^0.9.29",
+    "@looker/sdk": "^22.2.0",
+    "@looker/sdk-codegen": "^21.5.0",
+    "@looker/sdk-rtl": "^21.3.2",
     "@reduxjs/toolkit": "^1.6.2",
     "@styled-icons/material": "^10.28.0",
     "@styled-icons/material-outlined": "^10.28.0",
@@ -96,5 +96,5 @@
     "ts-jest": "^26.2.0",
     "typed-redux-saga": "^1.3.1"
   },
-  "gitHead": "933163198d7e1ab482c8c5aedc43c35eb9923d86"
+  "gitHead": "8db44f3017f7303ad84f678a9e4999c216dfcfd9"
 }

package/src/ApiExplorer.tsx

@@ -25,8 +25,7 @@
  */
 
 import type { FC } from 'react'
-import React, { useReducer, useState, useEffect, useCallback } from 'react'
-import { useLocation } from 'react-router'
+import React, { useState, useEffect, useCallback } from 'react'
 import styled, { createGlobalStyle } from 'styled-components'
 import {
   Aside,
@@ -38,27 +37,25 @@ import {
   Page,
   Space,
 } from '@looker/components'
-import type { SpecList } from '@looker/sdk-codegen'
-import type { RunItSetter } from '@looker/run-it'
-import { funFetch, fallbackFetch, OAuthScene } from '@looker/run-it'
 import { FirstPage } from '@styled-icons/material/FirstPage'
 import { LastPage } from '@styled-icons/material/LastPage'
-
-import type { IEnvironmentAdaptor } from '@looker/extension-utils'
 import {
   registerEnvAdaptor,
   unregisterEnvAdaptor,
 } from '@looker/extension-utils'
-import { oAuthPath } from './utils'
+import { useSelector } from 'react-redux'
+import { useLocation } from 'react-router-dom'
+
+import type { IApixAdaptor } from './utils'
 import {
   Header,
   SideNav,
   ErrorBoundary,
-  Loader,
   SelectorContainer,
   HEADER_TOGGLE_LABEL,
+  Loader,
+  Banner,
 } from './components'
-import { specReducer, initDefaultSpecState, updateSpecApi } from './reducers'
 import { AppRouter } from './routes'
 import { apixFilesHost } from './utils/lodeUtils'
 import {
@@ -66,12 +63,15 @@ import {
   useSettingStoreState,
   useLodeActions,
   useLodesStoreState,
+  useSpecActions,
+  useSpecStoreState,
+  selectSpecs,
+  selectCurrentSpec,
 } from './state'
+import { getSpecKey, diffPath } from './utils'
 
 export interface ApiExplorerProps {
-  specs: SpecList
-  adaptor: IEnvironmentAdaptor
-  setVersionsUrl: RunItSetter
+  adaptor: IApixAdaptor
   examplesLodeUrl?: string
   declarationsLodeUrl?: string
   headless?: boolean
@@ -80,25 +80,21 @@ export interface ApiExplorerProps {
 const BodyOverride = createGlobalStyle` html { height: 100%; overflow: hidden; } `
 
 export const ApiExplorer: FC<ApiExplorerProps> = ({
-  specs,
   adaptor,
-  setVersionsUrl,
   examplesLodeUrl = 'https://raw.githubusercontent.com/looker-open-source/sdk-codegen/main/examplesIndex.json',
   declarationsLodeUrl = `${apixFilesHost}/declarationsIndex.json`,
   headless = false,
 }) => {
-  const { initialized } = useSettingStoreState()
+  useSettingStoreState()
   useLodesStoreState()
+  const { working, description } = useSpecStoreState()
+  const specs = useSelector(selectSpecs)
+  const spec = useSelector(selectCurrentSpec)
   const { initLodesAction } = useLodeActions()
   const { initSettingsAction } = useSettingActions()
-  const location = useLocation()
-  const oauthReturn = location.pathname === `/${oAuthPath}`
-  const [specState, specDispatch] = useReducer(
-    specReducer,
-    initDefaultSpecState(specs, location)
-  )
-  const { spec } = specState
+  const { initSpecsAction, setCurrentSpecAction } = useSpecActions()
 
+  const location = useLocation()
   const [hasNavigation, setHasNavigation] = useState(true)
   const toggleNavigation = (target?: boolean) =>
     setHasNavigation(target || !hasNavigation)
@@ -109,14 +105,24 @@ export const ApiExplorer: FC<ApiExplorerProps> = ({
     }
   }, [])
 
+  registerEnvAdaptor(adaptor)
+
   useEffect(() => {
-    registerEnvAdaptor(adaptor)
     initSettingsAction()
     initLodesAction({ examplesLodeUrl, declarationsLodeUrl })
 
+    const specKey = getSpecKey(location)
+    initSpecsAction({ specKey })
     return () => unregisterEnvAdaptor()
   }, [])
 
+  useEffect(() => {
+    const maybeSpec = location.pathname?.split('/')[1]
+    if (spec && maybeSpec && maybeSpec !== diffPath && maybeSpec !== spec.key) {
+      setCurrentSpecAction({ currentSpecKey: maybeSpec })
+    }
+  }, [location.pathname, spec])
+
   useEffect(() => {
     if (headless) {
       window.addEventListener('message', hasNavigationToggle)
@@ -128,46 +134,27 @@ export const ApiExplorer: FC<ApiExplorerProps> = ({
     }
   }, [headless, hasNavigationToggle])
 
-  useEffect(() => {
-    const loadSpec = async () => {
-      if (!spec.api) {
-        try {
-          const newSpec = { ...spec }
-          const api = await fallbackFetch(newSpec, funFetch)
-          if (api) {
-            spec.api = api
-            specDispatch(updateSpecApi(spec.key, api))
-          }
-        } catch (error) {
-          console.error(error)
-        }
-      }
-    }
-    if (!oauthReturn) {
-      loadSpec()
-    }
-  }, [spec, location])
-
   const themeOverrides = adaptor.themeOverrides()
 
+  let neededSpec = location.pathname?.split('/')[1]
+  if (!neededSpec || neededSpec === diffPath) {
+    neededSpec = spec?.key
+  }
+
   return (
     <>
       <ComponentsProvider
         loadGoogleFonts={themeOverrides.loadGoogleFonts}
         themeCustomizations={themeOverrides.themeCustomizations}
       >
-        {!initialized ? (
-          <Loader message="Initializing" themeOverrides={themeOverrides} />
+        {working || !neededSpec || neededSpec !== spec.key ? (
+          <Loader message={description} themeOverrides={themeOverrides} />
         ) : (
           <ErrorBoundary logError={adaptor.logError.bind(adaptor)}>
+            <Banner adaptor={adaptor} specs={specs} />
             <Page style={{ overflow: 'hidden' }}>
               {!headless && (
-                <Header
-                  specs={specs}
-                  spec={spec}
-                  specDispatch={specDispatch}
-                  toggleNavigation={toggleNavigation}
-                />
+                <Header spec={spec} toggleNavigation={toggleNavigation} />
               )}
               <Layout hasAside height="100%">
                 <AsideBorder
@@ -207,36 +194,22 @@ export const ApiExplorer: FC<ApiExplorerProps> = ({
                         <>
                           <Divider mb="u3" appearance="light" />
                           <SelectorContainer
+                            spec={spec}
                             ml="large"
                             mr="large"
-                            specs={specs}
-                            spec={spec}
-                            specDispatch={specDispatch}
                           />
                         </>
                       )}
                     </>
                   )}
-                  {hasNavigation && (
-                    <SideNav
-                      headless={headless}
-                      specs={specs}
-                      spec={spec}
-                      specDispatch={specDispatch}
-                    />
-                  )}
+                  {hasNavigation && <SideNav headless={headless} spec={spec} />}
                 </AsideBorder>
-                {oauthReturn && <OAuthScene />}
-                {!oauthReturn && spec.api && (
-                  <AppRouter
-                    api={spec.api}
-                    specKey={spec.key}
-                    specs={specs}
-                    toggleNavigation={toggleNavigation}
-                    adaptor={adaptor}
-                    setVersionsUrl={setVersionsUrl}
-                  />
-                )}
+                <AppRouter
+                  specKey={spec.key}
+                  api={spec.api!}
+                  specs={specs}
+                  toggleNavigation={toggleNavigation}
+                />
               </Layout>
             </Page>
           </ErrorBoundary>