npm - kishare - Versions diffs - 1.0.0 → 1.0.2 - Mend

kishare 1.0.0 → 1.0.2

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (6) hide show

package/package.json +10 -9
package/src/indexer/indexer-utils.ts +43 -5
package/index.html +0 -15
package/tsconfig.json +0 -26
package/vendor/kicanvas/tsconfig.json +0 -48
package/vite.config.ts +0 -69

package/package.json CHANGED Viewed

@@ -1,6 +1,6 @@
 {
   "name": "kishare",
-  "version": "1.0.0",
+  "version": "1.0.2",
   "type": "module",
   "description": "CLI tool for generating static KiCad project viewer sites",
   "homepage": "https://github.com/hmcty/kishare",
@@ -13,12 +13,9 @@
     "vite"
   ],
   "files": [
-    "bin",
-    "src",
-    "vendor/kicanvas/build",
-    "index.html",
-    "vite.config.ts",
-    "tsconfig.json"
+    "bin/",
+    "src/",
+    "vendor/kicanvas/build/kicanvas.js"
   ],
   "scripts": {
     "setup": "cd ./vendor/kicanvas && npm install && npm run build",
@@ -48,6 +45,10 @@
     "marked": "^17.0.6",
     "marked-base-url": "^1.1.8",
     "tsx": "^4.7.2",
-    "vite": "^5.2.8"
-  }
+    "vite": "^5.2.8",
+    "kicanvas": "file:vendor/kicanvas"
+  },
+  "bundledDependencies": [
+    "kicanvas"
+  ]
 }

package/src/indexer/indexer-utils.ts CHANGED Viewed

@@ -89,19 +89,57 @@ export function getKishareRootDir(): string {
   return KISHARE_ROOT;
 }
+// Find the git repository root directory
+function findGitRoot(startDir: string): string | null {
+  try {
+    const gitRoot = execSync('git rev-parse --show-toplevel', {
+      cwd: startDir,
+      encoding: 'utf-8',
+      stdio: ['pipe', 'pipe', 'pipe'],
+    }).trim();
+    return gitRoot;
+  } catch {
+    return null;
+  }
+}
 // Get list of git-tracked files in the specified project directories
 export function getTrackedFiles(projectDirs: string[]): Set<string> {
   const allFiles = new Set<string>();
+  // Find the git root - it might be above ROOT_DIR (e.g., when ROOT_DIR is a subdirectory)
+  const gitRoot = findGitRoot(getRootDir());
+  if (!gitRoot) {
+    console.warn('Not in a git repository, cannot get tracked files');
+    return allFiles;
+  }
   for (const projectDir of projectDirs) {
     try {
-      const relativeDir = path.relative(getRootDir(), projectDir);
-      console.log(`Getting git tracked files for ${relativeDir}...`);
-      const output = execSync(`git ls-files --recurse-submodules "${relativeDir}/"`, {
-        cwd: getRootDir(),
+      // Get path relative to git root for the git command
+      const relativeToGit = path.relative(gitRoot, projectDir);
+      // Get path relative to ROOT_DIR for the output
+      const relativeToRoot = path.relative(getRootDir(), projectDir);
+      console.log(`Getting git tracked files for ${relativeToRoot}...`);
+      const output = execSync(`git ls-files --recurse-submodules "${relativeToGit}/"`, {
+        cwd: gitRoot,
         encoding: 'utf-8',
       });
-      output.trim().split('\n').filter(f => f).forEach(f => allFiles.add(f));
+      // Convert paths from git-root-relative to ROOT_DIR-relative
+      const gitRootToRootDir = path.relative(gitRoot, getRootDir());
+      output.trim().split('\n').filter(f => f).forEach(gitRelativePath => {
+        // Convert: path relative to git root -> path relative to ROOT_DIR
+        const absolutePath = path.join(gitRoot, gitRelativePath);
+        const rootRelativePath = path.relative(getRootDir(), absolutePath);
+        // Only include if the file is within ROOT_DIR (not above it)
+        if (!rootRelativePath.startsWith('..')) {
+          allFiles.add(rootRelativePath);
+        }
+      });
     } catch (error) {
       console.warn(`Could not get git tracked files for ${projectDir}`);
     }

package/index.html DELETED Viewed

@@ -1,15 +0,0 @@
-<!DOCTYPE html>
-<html lang="en">
-<head>
-  <meta charset="UTF-8">
-  <meta name="viewport" content="width=device-width, initial-scale=1.0">
-  <meta http-equiv="Content-Security-Policy" content="default-src 'self'; script-src 'self' 'unsafe-inline' 'wasm-unsafe-eval'; style-src 'self' 'unsafe-inline' https://fonts.googleapis.com; img-src 'self' data: blob:; connect-src 'self'; font-src 'self' https://fonts.gstatic.com; worker-src 'self' blob:; object-src 'none'; base-uri 'self'; form-action 'self';">
-  <title>KiShare Workspace</title>
-</head>
-<body>
-  <workspace-app></workspace-app>
-  <script type="module" src="/kicanvas/kicanvas.js"></script>
-  <script type="module" src="/src/main.ts"></script>
-</body>
-</html>

package/tsconfig.json DELETED Viewed

@@ -1,26 +0,0 @@
-{
-  "compilerOptions": {
-    "target": "ES2020",
-    "useDefineForClassFields": true,
-    "module": "ESNext",
-    "lib": ["ES2020", "DOM", "DOM.Iterable"],
-    "skipLibCheck": true,
-    /* Bundler mode */
-    "moduleResolution": "bundler",
-    "allowImportingTsExtensions": true,
-    "resolveJsonModule": true,
-    "isolatedModules": true,
-    "noEmit": true,
-    /* Linting */
-    "strict": true,
-    "noUnusedLocals": true,
-    "noUnusedParameters": true,
-    "noFallthroughCasesInSwitch": true,
-    "esModuleInterop": true,
-    "allowSyntheticDefaultImports": true,
-    "forceConsistentCasingInFileNames": true
-  },
-  "include": ["src"]
-}

package/vendor/kicanvas/tsconfig.json DELETED Viewed

@@ -1,48 +0,0 @@
-{
-    "compilerOptions": {
-        /* Visit https://aka.ms/tsconfig to read more about this file */
-        /* Language and Environment */
-        "target": "es2022" /* Set the JavaScript language version for emitted JavaScript and include compatible library declarations. */,
-        "moduleResolution": "bundler",
-        // "moduleDetection": "auto",                        /* Control what method is used to detect module-format JS files. */
-        "experimentalDecorators": true,
-        "useDefineForClassFields": false, // Required to use experimental decorators
-        /* Modules */
-        "module": "es2022" /* Specify what module code is generated. */,
-        "allowImportingTsExtensions": true,
-        "verbatimModuleSyntax": true,
-        "allowArbitraryExtensions": true,
-        /* JavaScript Support */
-        "allowJs": true /* Allow JavaScript files to be a part of your program. Use the 'checkJS' option to get errors from these files. */,
-        "checkJs": true /* Enable error reporting in type-checked JavaScript files. */,
-        /* Emit */
-        // "outDir": "./build", /* Specify an output folder for all emitted files. */
-        // "sourceMap": true,
-        "noEmit": true /* Disable emitting files from a compilation. */,
-        /* Interop Constraints */
-        // "preserveSymlinks": true,                         /* Disable resolving symlinks to their realpath. This correlates to the same flag in node. */
-        "forceConsistentCasingInFileNames": true /* Ensure that casing is correct in imports. */,
-        /* Type Checking */
-        // "strict": true, /* Enable all strict type-checking options. */
-        "noImplicitAny": true /* Enable error reporting for expressions and declarations with an implied 'any' type. */,
-        "strictNullChecks": true /* When type checking, take into account 'null' and 'undefined'. */,
-        "strictFunctionTypes": true /* When assigning functions, check to ensure parameters and the return values are subtype-compatible. */,
-        "strictBindCallApply": true /* Check that the arguments for 'bind', 'call', and 'apply' methods match the original function. */,
-        // "strictPropertyInitialization": true,             /* Check for class properties that are declared but not set in the constructor. */
-        "noImplicitThis": true /* Enable error reporting when 'this' is given the type 'any'. */,
-        "useUnknownInCatchVariables": true /* Default catch clause variables as 'unknown' instead of 'any'. */,
-        "alwaysStrict": true /* Ensure 'use strict' is always emitted. */,
-        "noUnusedLocals": true /* Enable error reporting when local variables aren't read. */,
-        // "noUnusedParameters": true, /* Raise an error when a function parameter isn't read. */
-        // "exactOptionalPropertyTypes": true, /* Interpret optional property types as written, rather than adding 'undefined'. */
-        "noImplicitReturns": true /* Enable error reporting for codepaths that do not explicitly return in a function. */,
-        "noFallthroughCasesInSwitch": true /* Enable error reporting for fallthrough cases in switch statements. */,
-        "noUncheckedIndexedAccess": true /* Add 'undefined' to a type when accessed using an index. */,
-        "noImplicitOverride": true /* Ensure overriding members in derived classes are marked with an override modifier. */,
-        "noPropertyAccessFromIndexSignature": true /* Enforces using indexed accessors for keys declared using an indexed type. */,
-        "allowUnusedLabels": false,
-        "allowUnreachableCode": false,
-    },
-    "include": ["./src/**/*", "./test/**/*"],
-    "exclude": ["./node_modules", "./**/node_modules/*", "./scripts/"],
-}

package/vite.config.ts DELETED Viewed

@@ -1,69 +0,0 @@
-import { defineConfig } from 'vite';
-import fs from 'fs';
-import path from 'path';
-import { fileURLToPath } from 'url';
-const __dirname = path.dirname(fileURLToPath(import.meta.url));
-// When used via CLI, KISHARE_PROJECT_ROOT points to user's project
-// Build output goes to user's project/dist by default
-const projectRoot = process.env.KISHARE_PROJECT_ROOT || __dirname;
-const defaultOutDir = path.join(projectRoot, 'dist');
-export default defineConfig({
-  base: "",
-  build: {
-    outDir: defaultOutDir,
-    assetsDir: 'assets',
-    sourcemap: true,
-  },
-  server: {
-    port: 5173,
-    open: true,
-    middlewareMode: false,
-  },
-  publicDir: 'public',
-  appType: 'spa',
-  plugins: [
-    {
-      name: 'serve-public-files',
-      configureServer(server) {
-        server.middlewares.use((req, res, next) => {
-          // Serve files from public directory for specific extensions
-          if (req.url?.match(/\.(kicad_pro|kicad_sch|kicad_pcb|zip|png|jpg|jpeg|gif|svg|webp|md)$/i)) {
-            // Security: Normalize path and prevent directory traversal
-            const requestedPath = req.url.split('?')[0]; // Remove query params
-            const filePath = path.normalize(path.join(__dirname, 'public', requestedPath));
-            // Ensure the resolved path is within public directory
-            const publicDir = path.join(__dirname, 'public');
-            if (!filePath.startsWith(publicDir)) {
-              res.statusCode = 403;
-              res.end('Forbidden');
-              return;
-            }
-            if (fs.existsSync(filePath) && fs.statSync(filePath).isFile()) {
-              const content = fs.readFileSync(filePath);
-              // Set appropriate Content-Type header
-              let contentType = 'application/octet-stream';
-              if (req.url.endsWith('.zip')) contentType = 'application/zip';
-              else if (req.url.match(/\.(kicad_pro|kicad_sch|kicad_pcb)$/)) contentType = 'application/json';
-              else if (req.url.endsWith('.png')) contentType = 'image/png';
-              else if (req.url.match(/\.(jpg|jpeg)$/)) contentType = 'image/jpeg';
-              else if (req.url.endsWith('.gif')) contentType = 'image/gif';
-              else if (req.url.endsWith('.svg')) contentType = 'image/svg+xml';
-              else if (req.url.endsWith('.webp')) contentType = 'image/webp';
-              else if (req.url.endsWith('.md')) contentType = 'text/markdown';
-              res.setHeader('Content-Type', contentType);
-              res.end(content);
-              return;
-            }
-          }
-          next();
-        });
-      },
-    },
-  ],
-});