@mapples/cli 0.0.9 → 0.0.10

package/README.md

@@ -46,7 +46,7 @@ This command will:
 - Generate React components using templates
 - Create page directories with the following structure:
   ```
-  src/pages/{PageName}/
+  mapples/pages/{PageName}/
   ├── {PageName}Mapplet.tsx
   ├── {PageName}.json
   ├── _meta_{PageName}.json
@@ -82,7 +82,7 @@ The CLI uses a `.mapplesrc.json` file for configuration. Here are the available
   "pagesDir": "pages",
   "styleDir": "style",
   "assetsDir": "assets",
-  "sourceDir": "src"
+  "sourceDir": "mapples"
 }
 ```
 
@@ -95,7 +95,7 @@ The CLI uses a `.mapplesrc.json` file for configuration. Here are the available
 - **pagesDir**: Directory name for pages (default: "pages")
 - **styleDir**: Directory name for styles (default: "style")
 - **assetsDir**: Directory name for assets (default: "assets")
-- **sourceDir**: Source directory name (default: "src")
+- **sourceDir**: Source directory name (default: "mapples")
 
 ## Generated Files
 

package/dist/index.js

@@ -23376,16 +23376,16 @@ function requireSubscription () {
 	return Subscription;
 }
 
-var config$1 = {};
+var config = {};
 
 var hasRequiredConfig;
 
 function requireConfig () {
-	if (hasRequiredConfig) return config$1;
+	if (hasRequiredConfig) return config;
 	hasRequiredConfig = 1;
-	Object.defineProperty(config$1, "__esModule", { value: true });
-	config$1.config = void 0;
-	config$1.config = {
+	Object.defineProperty(config, "__esModule", { value: true });
+	config.config = void 0;
+	config.config = {
 	    onUnhandledError: null,
 	    onStoppedNotification: null,
 	    Promise: undefined,
@@ -23393,7 +23393,7 @@ function requireConfig () {
 	    useDeprecatedNextContext: false,
 	};
 	
-	return config$1;
+	return config;
 }
 
 var reportUnhandledError = {};
@@ -50244,7 +50244,7 @@ const DEFAULT_CONFIG = {
     sandboxUrl: 'https://staging.mapples.org',
     assetUrl: 'https://staging.assets.mapples.org',
     useExpoRouter: false,
-    sourceDir: 'src',
+    sourceDir: 'mapples',
     dirs: {
         pages: 'pages',
         style: 'style',
@@ -52818,6 +52818,87 @@ const getPackageVersionFromJson = (packageName) => {
 const getInstalledVersion = (packageName) => {
     return getPackageVersionFromJson(packageName);
 };
+const parseVersion = (version) => {
+    const parts = version.split('.').map(Number);
+    while (parts.length < 3) {
+        parts.push(0);
+    }
+    return parts;
+};
+const compareVersions = (v1, v2) => {
+    const parts1 = parseVersion(v1);
+    const parts2 = parseVersion(v2);
+    for (let i = 0; i < 3; i++) {
+        if (parts1[i] < parts2[i])
+            return -1;
+        if (parts1[i] > parts2[i])
+            return 1;
+    }
+    return 0;
+};
+const isVersionSatisfied = (installedVersion, latestVersion) => {
+    try {
+        // Remove whitespace
+        const installed = installedVersion.trim();
+        const latest = latestVersion.trim();
+        // If exact match (starts with a digit, no prefix), do exact comparison
+        if (/^\d/.test(installed)) {
+            return compareVersions(installed, latest) === 0;
+        }
+        // Handle caret (^) prefix: ^1.0.3 means >=1.0.3 <2.0.0
+        if (installed.startsWith('^')) {
+            const baseVersion = installed.slice(1);
+            const baseParts = parseVersion(baseVersion);
+            // Check if latest >= base version
+            if (compareVersions(latest, baseVersion) < 0) {
+                return false;
+            }
+            // Check if latest < next major version
+            const nextMajor = [baseParts[0] + 1, 0, 0];
+            const nextMajorStr = nextMajor.join('.');
+            return compareVersions(latest, nextMajorStr) < 0;
+        }
+        // Handle tilde (~) prefix: ~1.0.3 means >=1.0.3 <1.1.0
+        if (installed.startsWith('~')) {
+            const baseVersion = installed.slice(1);
+            const baseParts = parseVersion(baseVersion);
+            // Check if latest >= base version
+            if (compareVersions(latest, baseVersion) < 0) {
+                return false;
+            }
+            // Check if latest < next minor version
+            const nextMinor = [baseParts[0], baseParts[1] + 1, 0];
+            const nextMinorStr = nextMinor.join('.');
+            return compareVersions(latest, nextMinorStr) < 0;
+        }
+        // Handle >= prefix
+        if (installed.startsWith('>=')) {
+            const minVersion = installed.slice(2);
+            return compareVersions(latest, minVersion) >= 0;
+        }
+        // Handle <= prefix
+        if (installed.startsWith('<=')) {
+            const maxVersion = installed.slice(2);
+            return compareVersions(latest, maxVersion) <= 0;
+        }
+        // Handle > prefix
+        if (installed.startsWith('>')) {
+            const minVersion = installed.slice(1);
+            return compareVersions(latest, minVersion) > 0;
+        }
+        // Handle < prefix
+        if (installed.startsWith('<')) {
+            const maxVersion = installed.slice(1);
+            return compareVersions(latest, maxVersion) < 0;
+        }
+        // If we can't parse it, fall back to string comparison
+        return installed === latest;
+    }
+    catch {
+        // If parsing fails, fall back to string comparison
+        return installedVersion === latestVersion;
+    }
+};
 const installPackage = (packageName, version, packageManager) => {
     try {
         let command;
@@ -52938,7 +53019,7 @@ const syncPackages = async (autoApprove = false) => {
                         type: 'mapples',
                     });
                 }
-                else if (installedVersion !== latestVersion) {
+                else if (!isVersionSatisfied(installedVersion, latestVersion)) {
                     packagesToUpdate.push({
                         name: packageName,
                         currentVersion: installedVersion,
@@ -53068,7 +53149,7 @@ const showPackageInfo = () => {
             if (!installedVersion) {
                 console.log(chalk.red(`  • ${packageName}: not installed (latest: ${latestVersion || 'unknown'})`));
             }
-            else if (installedVersion !== latestVersion) {
+            else if (!latestVersion || !isVersionSatisfied(installedVersion, latestVersion)) {
                 console.log(chalk.yellow(`  • ${packageName}: ${installedVersion} (latest: ${latestVersion || 'unknown'})`));
             }
             else {
@@ -75739,19 +75820,41 @@ const assetsService = (axiosInstance) => {
     };
 };
 
-const config = readConfig() || { ...DEFAULT_CONFIG, apiKey: '' };
-const sandboxAxiosInstance = axios.create({
-    baseURL: config.sandboxUrl,
-    headers: {
-        'X-API-Key': config.apiKey,
+let sandboxAxiosInstance = null;
+const getAxiosInstance = () => {
+    const config = readConfig() || { ...DEFAULT_CONFIG, apiKey: '' };
+    // Create or update the axios instance with current config
+    if (!sandboxAxiosInstance) {
+        sandboxAxiosInstance = axios.create({
+            baseURL: config.sandboxUrl,
+            headers: {
+                'X-API-Key': config.apiKey,
+            },
+        });
+    }
+    else {
+        // Update the existing instance with new config
+        sandboxAxiosInstance.defaults.baseURL = config.sandboxUrl;
+        sandboxAxiosInstance.defaults.headers['X-API-Key'] = config.apiKey;
+    }
+    return sandboxAxiosInstance;
+};
+const getServices = () => {
+    const instance = getAxiosInstance();
+    return {
+        pages: pagesService(instance),
+        project: projectService(instance),
+        style: styleService(instance),
+        assets: assetsService(instance),
+    };
+};
+// Initialize services with lazy loading
+const services = new Proxy({}, {
+    get(_, prop) {
+        const servicesInstance = getServices();
+        return servicesInstance[prop];
     },
 });
-const services = {
-    pages: pagesService(sandboxAxiosInstance),
-    project: projectService(sandboxAxiosInstance),
-    style: styleService(sandboxAxiosInstance),
-    assets: assetsService(sandboxAxiosInstance),
-};
 
 const fetchPages = async () => {
     try {