@nocobase/sdk 0.10.1-alpha.1 → 0.11.1-alpha.1

package/es/APIClient.d.ts

@@ -3,7 +3,7 @@ export interface ActionParams {
     filterByTk?: any;
     [key: string]: any;
 }
-declare type ResourceActionOptions<P = any> = {
+type ResourceActionOptions<P = any> = {
     resource?: string;
     resourceOf?: any;
     action?: string;
@@ -24,6 +24,7 @@ export declare class Auth {
         role: string;
         token: string;
         authenticator: string;
+        theme: string;
     };
     protected options: {
         locale: any;
@@ -73,11 +74,12 @@ interface ExtendedOptions {
     authClass?: any;
     storageClass?: any;
 }
+export type APIClientOptions = AxiosInstance | (AxiosRequestConfig & ExtendedOptions);
 export declare class APIClient {
     axios: AxiosInstance;
     auth: Auth;
     storage: Storage;
-    constructor(instance?: AxiosInstance | (AxiosRequestConfig & ExtendedOptions));
+    constructor(instance?: APIClientOptions);
     private initStorage;
     interceptors(): void;
     request<T = any, R = AxiosResponse<T>, D = any>(config: AxiosRequestConfig<D> | ResourceActionOptions): Promise<R>;

package/es/APIClient.js

@@ -11,6 +11,7 @@ function asyncGeneratorStep(gen, resolve, reject, _next, _throw, key, arg) { try
 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); }); }; }
 import axios from 'axios';
 import qs from 'qs';
+import getSubAppName from './getSubAppName';
 export class Auth {
   constructor(api) {
     this.api = void 0;
@@ -18,7 +19,8 @@ export class Auth {
       locale: 'NOCOBASE_LOCALE',
       role: 'NOCOBASE_ROLE',
       token: 'NOCOBASE_TOKEN',
-      authenticator: 'NOCOBASE_AUTH'
+      authenticator: 'NOCOBASE_AUTH',
+      theme: 'NOCOBASE_THEME'
     };
     this.options = {
       locale: null,
@@ -34,11 +36,10 @@ export class Auth {
     if (!window) {
       return;
     }
-    const match = window.location.pathname.match(/^\/apps\/([^/]*)\//);
-    if (!match) {
+    const appName = getSubAppName();
+    if (!appName) {
       return;
     }
-    const appName = match[1];
     this.KEYS['role'] = `${appName.toUpperCase()}_` + this.KEYS['role'];
     this.KEYS['locale'] = `${appName.toUpperCase()}_` + this.KEYS['locale'];
   }

package/es/getSubAppName.d.ts

@@ -0,0 +1,2 @@
+declare const getSubAppName: () => string;
+export default getSubAppName;

package/es/getSubAppName.js

@@ -0,0 +1,8 @@
+const getSubAppName = () => {
+  const match = window.location.pathname.match(/^\/apps\/([^/]*)\//);
+  if (!match) {
+    return '';
+  }
+  return match[1].toUpperCase();
+};
+export default getSubAppName;

package/es/index.d.ts

@@ -1 +1,2 @@
 export * from './APIClient';
+export { default as getSubAppName } from './getSubAppName';

package/es/index.js

@@ -1 +1,2 @@
-export * from './APIClient';
+export * from './APIClient';
+export { default as getSubAppName } from './getSubAppName';

package/lib/APIClient.d.ts

@@ -3,7 +3,7 @@ export interface ActionParams {
     filterByTk?: any;
     [key: string]: any;
 }
-declare type ResourceActionOptions<P = any> = {
+type ResourceActionOptions<P = any> = {
     resource?: string;
     resourceOf?: any;
     action?: string;
@@ -24,6 +24,7 @@ export declare class Auth {
         role: string;
         token: string;
         authenticator: string;
+        theme: string;
     };
     protected options: {
         locale: any;
@@ -73,11 +74,12 @@ interface ExtendedOptions {
     authClass?: any;
     storageClass?: any;
 }
+export type APIClientOptions = AxiosInstance | (AxiosRequestConfig & ExtendedOptions);
 export declare class APIClient {
     axios: AxiosInstance;
     auth: Auth;
     storage: Storage;
-    constructor(instance?: AxiosInstance | (AxiosRequestConfig & ExtendedOptions));
+    constructor(instance?: APIClientOptions);
     private initStorage;
     interceptors(): void;
     request<T = any, R = AxiosResponse<T>, D = any>(config: AxiosRequestConfig<D> | ResourceActionOptions): Promise<R>;

package/lib/APIClient.js

@@ -6,6 +6,7 @@ Object.defineProperty(exports, "__esModule", {
 exports.Storage = exports.MemoryStorage = exports.Auth = exports.APIClient = void 0;
 var _axios = _interopRequireDefault(require("axios"));
 var _qs = _interopRequireDefault(require("qs"));
+var _getSubAppName = _interopRequireDefault(require("./getSubAppName"));
 const _excluded = ["authClass", "storageClass"],
   _excluded2 = ["values", "filter"];
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
@@ -25,7 +26,8 @@ class Auth {
       locale: 'NOCOBASE_LOCALE',
       role: 'NOCOBASE_ROLE',
       token: 'NOCOBASE_TOKEN',
-      authenticator: 'NOCOBASE_AUTH'
+      authenticator: 'NOCOBASE_AUTH',
+      theme: 'NOCOBASE_THEME'
     };
     this.options = {
       locale: null,
@@ -41,11 +43,10 @@ class Auth {
     if (!window) {
       return;
     }
-    const match = window.location.pathname.match(/^\/apps\/([^/]*)\//);
-    if (!match) {
+    const appName = (0, _getSubAppName.default)();
+    if (!appName) {
       return;
     }
-    const appName = match[1];
     this.KEYS['role'] = `${appName.toUpperCase()}_` + this.KEYS['role'];
     this.KEYS['locale'] = `${appName.toUpperCase()}_` + this.KEYS['locale'];
   }

package/lib/getSubAppName.d.ts

@@ -0,0 +1,2 @@
+declare const getSubAppName: () => string;
+export default getSubAppName;

package/lib/getSubAppName.js

@@ -0,0 +1,15 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.default = void 0;
+const getSubAppName = () => {
+  const match = window.location.pathname.match(/^\/apps\/([^/]*)\//);
+  if (!match) {
+    return '';
+  }
+  return match[1].toUpperCase();
+};
+var _default = getSubAppName;
+exports.default = _default;

package/lib/index.d.ts

@@ -1 +1,2 @@
 export * from './APIClient';
+export { default as getSubAppName } from './getSubAppName';

package/lib/index.js

@@ -3,9 +3,19 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
+var _exportNames = {
+  getSubAppName: true
+};
+Object.defineProperty(exports, "getSubAppName", {
+  enumerable: true,
+  get: function get() {
+    return _getSubAppName.default;
+  }
+});
 var _APIClient = require("./APIClient");
 Object.keys(_APIClient).forEach(function (key) {
   if (key === "default" || key === "__esModule") return;
+  if (Object.prototype.hasOwnProperty.call(_exportNames, key)) return;
   if (key in exports && exports[key] === _APIClient[key]) return;
   Object.defineProperty(exports, key, {
     enumerable: true,
@@ -13,4 +23,6 @@ Object.keys(_APIClient).forEach(function (key) {
       return _APIClient[key];
     }
   });
-});
+});
+var _getSubAppName = _interopRequireDefault(require("./getSubAppName"));
+function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nocobase/sdk",
-  "version": "0.10.1-alpha.1",
+  "version": "0.11.1-alpha.1",
   "license": "Apache-2.0",
   "main": "lib",
   "module": "es/index.js",
@@ -12,5 +12,5 @@
   "devDependencies": {
     "axios-mock-adapter": "^1.20.0"
   },
-  "gitHead": "8f415f5e0ee2e72d681f9ab16af5911b52c374a9"
+  "gitHead": "9ed1dba520bc5f3a7cb1255ea8d92ccbefc11bc8"
 }

package/src/APIClient.ts

@@ -1,5 +1,6 @@
 import axios, { AxiosInstance, AxiosRequestConfig, AxiosResponse } from 'axios';
 import qs from 'qs';
+import getSubAppName from './getSubAppName';
 
 export interface ActionParams {
   filterByTk?: any;
@@ -30,6 +31,7 @@ export class Auth {
     role: 'NOCOBASE_ROLE',
     token: 'NOCOBASE_TOKEN',
     authenticator: 'NOCOBASE_AUTH',
+    theme: 'NOCOBASE_THEME',
   };
 
   protected options = {
@@ -49,11 +51,10 @@ export class Auth {
     if (!window) {
       return;
     }
-    const match = window.location.pathname.match(/^\/apps\/([^/]*)\//);
-    if (!match) {
+    const appName = getSubAppName();
+    if (!appName) {
       return;
     }
-    const appName = match[1];
     this.KEYS['role'] = `${appName.toUpperCase()}_` + this.KEYS['role'];
     this.KEYS['locale'] = `${appName.toUpperCase()}_` + this.KEYS['locale'];
   }
@@ -223,12 +224,14 @@ interface ExtendedOptions {
   storageClass?: any;
 }
 
+export type APIClientOptions = AxiosInstance | (AxiosRequestConfig & ExtendedOptions);
+
 export class APIClient {
   axios: AxiosInstance;
   auth: Auth;
   storage: Storage;
 
-  constructor(instance?: AxiosInstance | (AxiosRequestConfig & ExtendedOptions)) {
+  constructor(instance?: APIClientOptions) {
     if (typeof instance === 'function') {
       this.axios = instance;
     } else {

package/src/getSubAppName.ts

@@ -0,0 +1,9 @@
+const getSubAppName = () => {
+  const match = window.location.pathname.match(/^\/apps\/([^/]*)\//);
+  if (!match) {
+    return '';
+  }
+  return match[1].toUpperCase();
+};
+
+export default getSubAppName;

package/src/index.ts

@@ -1 +1,3 @@
 export * from './APIClient';
+export { default as getSubAppName } from './getSubAppName';
+