@leverege/build-tools 2.93.0-beta.4 → 2.93.0-beta.6

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@leverege/build-tools",
-  "version": "2.93.0-beta.4",
+  "version": "2.93.0-beta.6",
   "description": "A collection of build / support tools for Leverege developers",
   "main": "index.js",
   "repository": {

package/src/package-artifact/Packager.mjs

@@ -12,6 +12,7 @@ class ArtifactPackager {
       hash.update( fs.readFileSync( this.artifact.source_path ) )
       return hash.digest( 'base64url' )
     } catch ( error ) {
+      console.error( error )
       throw new Error( `Failed to calculate hash for artifact ${this.artifact.name}: ${error.message}` )
     }
   }
@@ -41,6 +42,35 @@ class ArtifactPackager {
 class GenericArtifactPackager extends ArtifactPackager {
 
   async exists() {
+
+    const isDirectory = fs.statSync( this.artifact.source_path ).isDirectory()
+    
+    // If source path is a directory, check whether the destination path alreadu exists in the registry
+    if ( isDirectory ) {
+      // const command = `gcloud artifacts files list \
+      //   --project=${this.artifact.gcp_project_id} \
+      //   --location=${this.artifact.gcp_location} \
+      //   --repository=${this.artifact.gcp_artifact_registry_repository_name} \
+      //   --package=${this.artifact.gcp_artifact_registry_package_name} \
+      //   --version ${this.artifact.gcp_artifact_registry_package_version} \
+      //   --format="json"`
+      // const { execSync } = await import( 'child_process' )
+      // const result = execSync( command, { encoding : 'utf8', stdio : 'pipe' } )
+      // const files = JSON.parse( result )
+      
+      // // Calculate checksum for each file in the directory
+      // // ...
+      
+      // console.log( files )
+      // if ( files && files.length > 0 ) {
+      //   return true
+      // }
+      // return false
+      
+      // For the time being, return false, and let gcloud skip existing files in upload-time.
+      return false
+    }
+
     // Check if artifact already exists in the registry
     console.log( 'Checking if artifact already exists in the registry...' )
         
@@ -91,15 +121,27 @@ class GenericArtifactPackager extends ArtifactPackager {
     
   async publish() {
     console.log( 'Publishing artifact to registry...' )
-        
-    const command = `gcloud artifacts generic upload \
-        --project=${this.artifact.gcp_project_id} \
-        --location=${this.artifact.gcp_location} \
-        --repository=${this.artifact.gcp_artifact_registry_repository_name} \
-        --package=${this.artifact.gcp_artifact_registry_package_name} \
-        --version=${this.artifact.gcp_artifact_registry_package_version} \
-        --source=${this.artifact.source_path} \
-        --destination-path=${this.artifact.destination_path}`
+   
+    let command = ''
+
+    command = `gcloud artifacts generic upload \
+      --project=${this.artifact.gcp_project_id} \
+      --location=${this.artifact.gcp_location} \
+      --repository=${this.artifact.gcp_artifact_registry_repository_name} \
+      --package=${this.artifact.gcp_artifact_registry_package_name} \
+      --version=${this.artifact.gcp_artifact_registry_package_version}`
+
+    const isDirectory = fs.statSync( this.artifact.source_path ).isDirectory()
+    if ( isDirectory ) {
+      command += ` --source-directory=${this.artifact.source_path}`
+      command += ' --skip-existing'
+    } else {
+      command += ` --source=${this.artifact.source_path}`
+    }
+
+    if ( this.artifact.destination_path ) {
+      command += ` --destination-path=${this.artifact.destination_path}`
+    }
     
     // console.log( 'Command:', command )
         

package/src/package-artifact/Structs.mjs

@@ -31,7 +31,7 @@ const PartialGenericArtifactEntrySchema = assign( PartialArtifactEntrySchema, ob
 
 const GenericArtifactEntrySchema = assign( ArtifactEntrySchema, object( {
   source_path : string(),
-  destination_path : string()
+  destination_path : optional( string() )
 } ) )
 
 // Superstruct schema for defaults configuration

package/src/package-artifact/command.mjs

@@ -3,7 +3,7 @@
 import { warning } from '../Utils.mjs'
 
 import { getArtifactEntriesSchema, flattenArtifactEntriesSchema } from './Utils.mjs'
-import { GenericArtifactEntryPackager } from './Packager.mjs'
+import { GenericArtifactPackager } from './Packager.mjs'
 
 async function main() {
 
@@ -26,11 +26,13 @@ async function main() {
       console.error( `No artifact entries found for ${artifactPackageName} version ${artifactPackageVersion} in ${artifactsYmlPath}` )
       process.exit( 1 )
     }
+
+    // TODO: Use concurrency to package artifacts and provide summary of results.
     for ( const artifactSchema of filteredArtifactSchemas ) {
       let packager
       switch ( artifactSchema.type ) {
         case 'generic':
-          packager = new GenericArtifactEntryPackager( artifactSchema )
+          packager = new GenericArtifactPackager( artifactSchema )
           break
         default:
           warning( `Unsupported artifact type "${artifactSchema.type}"` )