@mindline/sync 1.0.92 → 1.0.95

package/index.test.ts

@@ -1,4 +1,4 @@
-import {sum} from "./index";
+import {sum} from "src/index";
 import {test, expect} from "vitest";
 
 test("adds 1 + 2 to equal 3", () => {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@mindline/sync",
-  "version": "1.0.92",
+  "version": "1.0.95",
   "description": "sync is a node.js package encapsulating JavaScript classes required for configuring Mindline sync service.",
   "main": "dist/sync.es.js",
   "types": "dist/index.d.ts",
@@ -16,11 +16,12 @@
   "license": "ISC",
   "type": "module",
   "devDependencies": {
+    "@rollup/plugin-strip": "^3.0.4",
     "@types/react": "^18.0.0",
     "@types/react-dom": "^18.0.0",
     "typescript": "^5.0.0",
     "vite": "^6.2.5",
-    "vitest": "3.0.9",
+    "vitest": "3.1.1",
     "@vitejs/plugin-react": "^4.3.4",
     "vite-plugin-dts": "^4.5.3"
   },

package/src/index.d.ts

@@ -2,6 +2,7 @@ import { IPublicClientApplication } from "@azure/msal-browser";
 declare module "@mindline/sync" {
     export function sum(a: number, b: number): number;
     export function helloNpm(): string;
+    export function getSyncVersion(): string;
 
     export class APIResult {
         result: boolean;

package/src/index.ts

@@ -3,7 +3,6 @@ import * as signalR from "@microsoft/signalr"
 import { AccountInfo } from "@azure/msal-common";
 import { IPublicClientApplication, AuthenticationResult } from "@azure/msal-browser"
 import { deserializeArray } from 'class-transformer';
-import { version } from '../package.json';
 import users from "./users.json";
 import tenants from "./tenants.json";
 import configs from "./configs.json";
@@ -21,13 +20,18 @@ export function helloNpm(): string {
     return "hello NPM";
 }
 // main application exports
+declare const __SYNC_VERSION__: string
+export function getSyncVersion(): string {
+    // injected at build time
+    return __SYNC_VERSION__;
+}
 export class APIResult {
     result: boolean;
     status: number;
     error: string;
     version: string;
     array: Array<Object> | null;
-    constructor() { this.result = true; this.status = 200; this.error = ""; this.version = version; this.array = null; }
+    constructor() { this.result = true; this.status = 200; this.error = ""; this.version = getSyncVersion(); this.array = null; }
 }
 export class azureConfig {
     // azure graph REST API endpoints
@@ -318,7 +322,7 @@ function storageAvailable() {
     }
 }
 export class InitInfo {
-    version: string = "";
+    version: string = getSyncVersion();
     tab: number = 0;
     us: User[] = [];
     ts: Tenant[] = [];
@@ -351,7 +355,7 @@ export class InitInfo {
         }
         // if storage unavailable or we were just asked to clear, read defaults to enable usable UI
         this.tab = 0;
-        this.version = version;
+        this.version = getSyncVersion();
         this.configlevelconsent_configid = "";
         this.configlevelconsent_access = TenantConfigType.sourcetarget;
         var usersString = JSON.stringify(users);
@@ -420,7 +424,7 @@ export class InitInfo {
     }
     #initFromObjects(ii: InitInfo): void {
         this.tab = ii.tab;
-        this.version = version;
+        this.version = getSyncVersion();
         this.configlevelconsent_configid = ii.configlevelconsent_configid;
         this.configlevelconsent_access = ii.configlevelconsent_access;
         if (typeof ii.us === "undefined") {
@@ -2110,7 +2114,7 @@ export async function initGet(instance: IPublicClientApplication, user: User, ii
             result = await workspaceInfoGet(instance, user, ii, debug);
             tasks.setTaskEnd("GET workspaces", new Date(), result.result ? "complete" : "failed");
         }
-        console.log("initGet complete. Version: " + version);
+        console.log("initGet complete. Version: " + getSyncVersion());
         return result;
     }
     else {
@@ -2298,7 +2302,7 @@ async function workspaceInfoGet(instance: IPublicClientApplication, user: User,
     try {
         result = await workspacesGet(instance, user, debug);
         if (result.result) {
-            for (let o of result.array! as Workspace[]) {
+            for (let o of result.array! as any[]) {
                 // are we already tracking this workspace?
                 let workspace: Workspace | null | undefined = null;
                 let wsIndex = ii.ws.findIndex((w) => w.id === o.id);
@@ -2347,7 +2351,8 @@ async function workspaceInfoGet(instance: IPublicClientApplication, user: User,
                 // set id and name based on returned data
                 workspace!.id = o.id;
                 workspace!.name = o.name;
-                workspace!.ownerid = o.ownerid;
+                debugger;
+                workspace!.ownerid = o.workspaceOwnerUserId;
                 // parallel GET admins, tenants, configs associated with this workspace
                 let adminsPromise: Promise<APIResult> = adminsGet(instance, user, workspace!.id, debug);
                 let tenantsPromise: Promise<APIResult> = tenantsGet(instance, user, workspace!.id, debug);

package/tsconfig.json

@@ -8,7 +8,7 @@
     "emitDeclarationOnly": true,
     "declarationDir": "./dist",
     "outDir": "./dist",
-    "rootDir": "src",
+    "rootDir": ".",
     "moduleResolution": "node",
     "esModuleInterop": true,
     "resolveJsonModule": true,

package/vite.config.ts

@@ -1,8 +1,13 @@
-import { defineConfig } from 'vite'
+import { defineConfig, Plugin } from 'vite'
+import pkg from './package.json'
 import react from '@vitejs/plugin-react'
 import dts from 'vite-plugin-dts'
+import strip from '@rollup/plugin-strip'
 
 export default defineConfig({
+    define: {
+        __SYNC_VERSION__: JSON.stringify(pkg.version)
+    },
     build: {
         lib: {
             entry: 'src/index.ts',
@@ -18,6 +23,24 @@ export default defineConfig({
                 'class-transformer',
                 'react',
                 'react-dom'
+            ],
+            output: {
+                // tell Rollup what global variable each external corresponds to
+                globals: {
+                    '@microsoft/signalr': 'signalR',
+                    'class-transformer': 'classTransformer',
+                    'react': 'React',
+                    'react-dom': 'ReactDOM'
+                }
+            },
+            plugins: [
+                // run this early to remove PURE annotations
+                strip({
+                    include: 'node_modules/@microsoft/signalr/**',
+                    comments: false,
+                    functions: [],      // leave functions intact
+                    sourceMap: false
+                })
             ]
         }
     },