@tmagic/utils 1.0.0-beta.6 → 1.0.0-rc.2

package/dist/types/src/index.d.ts

@@ -2,7 +2,7 @@ import { MNode } from '@tmagic/schema';
 export declare const sleep: (ms: number) => Promise<void>;
 export declare const datetimeFormatter: (v: string | Date, defaultValue?: string, f?: string) => string | number;
 export declare const asyncLoadJs: (url: string, crossOrigin?: string | undefined, document?: Document) => any;
-export declare const asyncLoadCss: (url: string) => Promise<unknown>;
+export declare const asyncLoadCss: (url: string, document?: Document) => any;
 export declare const toLine: (name?: string) => string;
 export declare const toHump: (name?: string) => string;
 export declare const emptyFn: () => any;
@@ -16,3 +16,5 @@ export declare const getNodePath: (id: number | string, data?: MNode[]) => MNode
 export declare const filterXSS: (str: string) => string;
 export declare const getUrlParam: (param: string, url?: string | undefined) => string;
 export declare const isPop: (node: MNode) => boolean;
+export declare const isPage: (node: MNode) => boolean;
+export declare const isNumber: (value: string) => boolean;

package/package.json

@@ -1,5 +1,5 @@
 {
-  "version": "1.0.0-beta.6",
+  "version": "1.0.0-rc.2",
   "name": "@tmagic/utils",
   "main": "dist/tmagic-utils.umd.js",
   "module": "dist/tmagic-utils.es.js",
@@ -10,8 +10,11 @@
       "require": "./dist/tmagic-utils.umd.js"
     }
   },
+  "license": "Apache-2.0",
   "scripts": {
-    "build": "vite build"
+    "build": "vite build",
+    "test": "jest --maxWorkers=8",
+    "test:coverage": "jest --maxWorkers=16 --coverage"
   },
   "engines": {
     "node": ">=14"
@@ -20,10 +23,20 @@
     "type": "git",
     "url": "https://github.com/Tencent/tmagic-editor.git"
   },
+  "dependencies": {
+    "@tmagic/schema": "^1.0.0-rc.2",
+    "moment": "^2.29.2"
+  },
   "devDependencies": {
+    "@types/jest": "^27.5.1",
     "@types/node": "^15.12.4",
+    "jest": "^27.5.1",
+    "jest-serializer-vue": "^2.0.2",
+    "jest-transform-stub": "^2.0.0",
+    "ts-jest": "^27.1.4",
     "typescript": "^4.3.4",
     "vite": "^2.3.7",
     "vite-plugin-dts": "^0.9.6"
-  }
+  },
+  "gitHead": "3e309780ed33640ab3fc986a93dd0e7b15c167e5"
 }

package/src/index.ts

@@ -18,7 +18,7 @@
 
 import moment from 'moment';
 
-import { MNode } from '@tmagic/schema';
+import { MNode, NodeType } from '@tmagic/schema';
 
 export const sleep = (ms: number): Promise<void> =>
   new Promise((resolve) => {
@@ -97,22 +97,44 @@ export const asyncLoadJs = (() => {
   };
 })();
 
-export const asyncLoadCss = function (url: string) {
-  return new Promise((resolve, reject) => {
-    const hasLoaded = globalThis.document.querySelector(`link[href="${url}"]`);
-    if (hasLoaded) {
-      resolve(undefined);
-      return;
+export const asyncLoadCss = (() => {
+  // 正在加载或加载成功的存入此Map中
+  const documentMap = new Map();
+
+  return (url: string, document = globalThis.document) => {
+    let loaded = documentMap.get(document);
+    if (!loaded) {
+      loaded = new Map();
+      documentMap.set(document, loaded);
     }
 
-    const node = document.createElement('link');
-    node.rel = 'stylesheet';
-    node.href = url;
-    document.getElementsByTagName('head')[0].appendChild(node);
-    node.onload = resolve;
-    node.onerror = reject;
-  });
-};
+    // 正在加载或已经加载成功的，直接返回
+    if (loaded.get(url)) return loaded.get(url);
+
+    const load = new Promise<void>((resolve, reject) => {
+      const node = document.createElement('link');
+      node.rel = 'stylesheet';
+      node.href = url;
+      document.head.appendChild(node);
+      node.onload = () => {
+        resolve();
+      };
+      node.onerror = () => {
+        reject(new Error('加载失败'));
+      };
+      setTimeout(() => {
+        reject(new Error('timeout'));
+      }, 60 * 1000);
+    }).catch((err) => {
+      // 加载失败的，从map中移除，第二次加载时，可以再次执行加载
+      loaded.delete(url);
+      throw err;
+    });
+
+    loaded.set(url, load);
+    return loaded.get(url);
+  };
+})();
 
 // 驼峰转换横线
 export const toLine = (name = '') => name.replace(/\B([A-Z])/g, '-$1').toLowerCase();
@@ -181,4 +203,8 @@ export const getUrlParam = (param: string, url?: string) => {
   return '';
 };
 
-export const isPop = (node: MNode): boolean => node.type.toLowerCase().endsWith('pop');
+export const isPop = (node: MNode): boolean => Boolean(node.type?.toLowerCase().endsWith('pop'));
+
+export const isPage = (node: MNode): boolean => Boolean(node.type?.toLowerCase() === NodeType.PAGE);
+
+export const isNumber = (value: string) => /^(-?\d+)(\.\d+)?$/.test(value);

package/tsconfig.json

@@ -1,9 +0,0 @@
-{
-  "extends": "../../tsconfig.json",
-  "compilerOptions": {
-    "baseUrl": "../..",
-  },
-  "exclude": [
-    "**/dist/**/*"
-  ],
-}

package/vite.config.ts

@@ -1,45 +0,0 @@
-/*
- * Tencent is pleased to support the open source community by making TMagicEditor available.
- *
- * Copyright (C) 2021 THL A29 Limited, a Tencent company.  All rights reserved.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-import { defineConfig } from 'vite';
-import dts from 'vite-plugin-dts';
-
-export default defineConfig({
-  plugins: [
-    dts({
-      outputDir: 'dist/types',
-      include: ['src/**/*'],
-      staticImport: true,
-      insertTypesEntry: true,
-      logDiagnostics: true,
-    }),
-  ],
-
-  build: {
-    cssCodeSplit: false,
-    sourcemap: true,
-    minify: false,
-    target: 'esnext',
-
-    lib: {
-      entry: 'src/index.ts',
-      name: 'TMagicUtils',
-      fileName: 'tmagic-utils',
-    },
-  },
-});