mvp

tinder-maxwellelliott · tinder-maxwellelliott · commit f2ab098e06df · 2023-11-13T10:54:02.000-05:00
diff --git a/Example/Localization/BUILD b/Example/Localization/BUILD
@@ -6,6 +6,7 @@ localize(
         "en.lproj/Localizable.strings",
         "es.lproj/Localizable.strings",
     ],
+    target_name = "example_Source_app_Sources",
     visibility = [
         "//Example/Source:__pkg__",
     ],
diff --git a/Example/Source/App.m b/Example/Source/App.m
@@ -4,7 +4,7 @@
 @implementation App
 
 + (NSString *)fetchLocalizationValueForKey:(NSString *)key {
-    return SSTStringForKeyWithBundleAndSubdirectory(key, [NSBundle bundleForClass:[App class]], nil);
+    return SSTStringForKeyWithBundleAndSubdirectoryAndTargetName(key, [NSBundle bundleForClass:[self class]], nil, @"example_Source_app_Sources");
 }
 
 @end
diff --git a/Example/Source/AppDelegate.m b/Example/Source/AppDelegate.m
@@ -5,8 +5,6 @@ @implementation AppDelegate
 
 - (BOOL)application:(UIApplication *)application
     didFinishLaunchingWithOptions:(NSDictionary *)launchOptions {
-    NSString *key1 = @"string1";
-    NSLog(@"Found %@ for key %@", SSTStringForKeyWithBundleAndSubdirectory(key1, [NSBundle mainBundle], nil), key1);
     return YES;
 }
 
diff --git a/Example/Source/Module/BUILD b/Example/Source/Module/BUILD
@@ -8,7 +8,7 @@ objc_library(
     srcs = ["Module.m"],
     hdrs = ["Module.h"],
     data = [
-        "//Example/Source/Module/Localization:localize_module_test",
+        "//Example/Source/Module/Localization:localizations",
     ],
     deps = [
         "//:SSTSmallStrings",
diff --git a/Example/Source/Module/Localization/BUILD b/Example/Source/Module/Localization/BUILD
@@ -6,6 +6,19 @@ localize(
         "en.lproj/Localizable.strings",
         "es.lproj/Localizable.strings",
     ],
+    target_name = "example_Source_Module_module",
+    visibility = [
+        "//Example/Source/Module:__pkg__",
+    ],
+)
+
+filegroup(
+    name = "localizations",
+    srcs = [
+        "en.lproj/Localizable.stringsdict",
+        "es.lproj/Localizable.stringsdict",
+        ":localize_module_test",
+    ],
     visibility = [
         "//Example/Source/Module:__pkg__",
     ],
diff --git a/Example/Source/Module/Localization/en.lproj/Localizable.stringsdict b/Example/Source/Module/Localization/en.lproj/Localizable.stringsdict
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+	<key>string1_stringdict</key>
+	<dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>string1_stringdict_en %#@formattedValue@</string>
+		<key>formattedValue</key>
+		<dict>
+			<key>NSStringFormatSpecTypeKey</key>
+			<string>NSStringPluralRuleType</string>
+			<key>NSStringFormatValueTypeKey</key>
+			<string>zd</string>
+			<key>one</key>
+			<string>%1$zd thing</string>
+			<key>other</key>
+			<string>%1$zd things</string>
+		</dict>
+	</dict>
+</dict>
+</plist>
diff --git a/Example/Source/Module/Localization/es.lproj/Localizable.stringsdict b/Example/Source/Module/Localization/es.lproj/Localizable.stringsdict
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+	<key>string1_stringdict</key>
+	<dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>string1_stringdict_es %#@formattedValue@</string>
+		<key>formattedValue</key>
+		<dict>
+			<key>NSStringFormatSpecTypeKey</key>
+			<string>NSStringPluralRuleType</string>
+			<key>NSStringFormatValueTypeKey</key>
+			<string>zd</string>
+			<key>one</key>
+			<string>%1$zd thing</string>
+			<key>other</key>
+			<string>%1$zd things</string>
+		</dict>
+	</dict>
+</dict>
+</plist>
diff --git a/Example/Source/Module/Module.m b/Example/Source/Module/Module.m
@@ -4,7 +4,7 @@
 @implementation Module
 
 + (NSString *)fetchLocalizationValueForKey:(NSString *)key {
-    return SSTStringForKeyWithBundleAndSubdirectory(key, [NSBundle bundleForClass:[Module class]], nil);
+    return SSTStringForKeyWithBundleAndSubdirectoryAndTargetName(key, [NSBundle bundleForClass:[self class]], nil, @"example_Source_Module_module");
 }
 
 @end
diff --git a/Source/SSTSmallStrings.h b/Source/SSTSmallStrings.h
@@ -3,3 +3,4 @@
 NSString *SSTStringForKey(NSString *key);
 NSString *SSTStringForKeyWithBundle(NSString *key, NSBundle *bundle);
 NSString *SSTStringForKeyWithBundleAndSubdirectory(NSString *key, NSBundle *bundle, NSString *subdirectory);
+NSString *SSTStringForKeyWithBundleAndSubdirectoryAndTargetName(NSString *key, NSBundle *bundle, NSString *subdirectory, NSString *targetName);
diff --git a/Source/SSTSmallStrings.m b/Source/SSTSmallStrings.m
@@ -25,18 +25,22 @@ id SSTJsonForName(NSString *name, NSBundle *bundle, NSString *subdirectory)
     return [NSJSONSerialization JSONObjectWithData:data options:0 error:nil];
 }
 
-NSDictionary <NSString *, NSString *> *SSTCreateKeyToString(NSBundle *bundle, NSString *subdirectory)
+NSDictionary <NSString *, NSString *> *SSTCreateKeyToString(NSBundle *bundle, NSString *subdirectory, NSString *targetName)
 {
     // Note that the preferred list does seem to at least include the development region as a fallback if there aren't
     // any other languages
     NSString *bestLocalization = [[bundle preferredLocalizations] firstObject] ?: [bundle developmentLocalization];
     if (!bestLocalization) {
         return @{};
     }
-    NSString *valuesPath = [NSString stringWithFormat:@"%@.values.json.lzfse", bestLocalization];
+    NSString *targetNamePrefix = @"";
+    if (targetName) {
+        targetNamePrefix = [NSString stringWithFormat:@"%@.", targetName];
+    }
+    NSString *valuesPath = [NSString stringWithFormat:@"%@%@.values.json.lzfse", targetNamePrefix, bestLocalization];
     NSArray <id> *values = SSTJsonForName(valuesPath, bundle, subdirectory);
 
-    NSArray <NSString *> *keys = SSTJsonForName(@"keys.json.lzfse", bundle, subdirectory);
+    NSArray <NSString *> *keys = SSTJsonForName([NSString stringWithFormat:@"%@keys.json.lzfse", targetNamePrefix], bundle, subdirectory);
 
     NSMutableDictionary <NSString *, NSString *> *keyToString = [NSMutableDictionary dictionaryWithCapacity:keys.count];
     NSInteger count = keys.count;
@@ -51,19 +55,24 @@ id SSTJsonForName(NSString *name, NSBundle *bundle, NSString *subdirectory)
     return keyToString; // Avoid -copy to be a bit faster
 }
 
-NSString *SSTStringForKeyWithBundleAndSubdirectory(NSString *key, NSBundle *bundle, NSString *subdirectory) {
+NSString *SSTStringForKeyWithBundleAndSubdirectoryAndTargetName(NSString *key, NSBundle *bundle, NSString *subdirectory, NSString *targetName) {
     static dispatch_once_t onceToken;
     dispatch_once(&onceToken, ^{
-        sKeyToString = SSTCreateKeyToString(bundle, subdirectory);
+        sKeyToString = SSTCreateKeyToString(bundle, subdirectory, targetName);
     });
     // Haven't tested with CFBundleAllowMixedLocalizations set to YES, although it seems like that'd be handled by the
     // NSLocalizedString fallback
     return sKeyToString[key] ?: NSLocalizedString(key, @"");
 }
 
+NSString *SSTStringForKeyWithBundleAndSubdirectory(NSString *key, NSBundle *bundle, NSString *subdirectory)
+{
+    return SSTStringForKeyWithBundleAndSubdirectoryAndTargetName(key, bundle, subdirectory, nil);
+}
+
 NSString *SSTStringForKeyWithBundle(NSString *key, NSBundle *bundle)
 {
-    return SSTStringForKeyWithBundleAndSubdirectory(key, bundle, @"localization");
+    return SSTStringForKeyWithBundleAndSubdirectoryAndTargetName(key, bundle, @"localization", nil);
 }
 
 NSString *SSTStringForKey(NSString *key)
diff --git a/WORKSPACE b/WORKSPACE
@@ -1,3 +1,5 @@
+workspace(name = "SmallStrings")
+
 load("@bazel_tools//tools/build_defs/repo:http.bzl", "http_archive")
 
 http_archive(
diff --git a/localize.bzl b/localize.bzl
@@ -2,11 +2,14 @@ def _localize_impl(ctx):
     localized_strings = {}
     lzfse_output_files = {}
     placeholder_files = []
+    target_name_prefix = ""
+    if ctx.attr.target_name:
+        target_name_prefix = ctx.attr.target_name + "."
     for src in ctx.files.srcs:
         locale = src.dirname.split("/")[-1].split(".")[0]
         localized_strings[locale] = _create_plutil_json_file(ctx, src, locale)
         lzfse_output_files[locale] = ctx.actions.declare_file(
-            "{target_name}.{locale}.values.json.lzfse".format(target_name = ctx.attr.target_name, locale = locale),
+            "{target_name_prefix}{locale}.values.json.lzfse".format(target_name_prefix = target_name_prefix, locale = locale),
         )
         placeholder_files.append(_create_placeholder_file(ctx, src))
     localized_strings_json_file = ctx.actions.declare_file(
@@ -24,7 +27,7 @@ def _localize_impl(ctx):
         json.encode(_stringify_file_dict(lzfse_output_files)),
     )
     keys_json_lzfse_file = ctx.actions.declare_file(
-        "{target_name}.keys.json.lzfse".format(target_name = ctx.attr.target_name),
+        "{target_name_prefix}keys.json.lzfse".format(target_name_prefix = target_name_prefix),
     )
     args = ctx.actions.args()
     args.add_all([
@@ -85,14 +88,16 @@ localize = rule(
     implementation = _localize_impl,
     attrs = {
         "srcs": attr.label_list(allow_files = [".strings"]),
-        "target_name": attr.string(),
+        "target_name": attr.string(
+            doc = "A string to key the localization artifacts by, this is optional since non-static builds do not require for assets to have unique name in the final bundle",
+        ),
         "_localize_tool": attr.label(
-            default = Label("//:localize"),
+            default = Label("@SmallStrings//:localize"),
             executable = True,
             cfg = "exec",
         ),
         "_compress_tool": attr.label(
-            default = Label("//:compress"),
+            default = Label("@SmallStrings//:compress"),
             executable = True,
             cfg = "exec",
         ),

Original file line number	Diff line number	Diff line change
`@@ -4,7 +4,7 @@`
`4`	`4`	`@implementation App`
`5`	`5`
`6`	`6`	`+ (NSString )fetchLocalizationValueForKey:(NSString )key {`
`7`		`- return SSTStringForKeyWithBundleAndSubdirectory(key, [NSBundle bundleForClass:[App class]], nil);`
	`7`	`+ return SSTStringForKeyWithBundleAndSubdirectoryAndTargetName(key, [NSBundle bundleForClass:[self class]], nil, @"example_Source_app_Sources");`
`8`	`8`	`}`
`9`	`9`
`10`	`10`	`@end`
Original file line number	Diff line number	Diff line change
`@@ -5,8 +5,6 @@ @implementation AppDelegate`
`5`	`5`
`6`	`6`	`- (BOOL)application:(UIApplication *)application`
`7`	`7`	`didFinishLaunchingWithOptions:(NSDictionary *)launchOptions {`
`8`		`- NSString *key1 = @"string1";`
`9`		`- NSLog(@"Found %@ for key %@", SSTStringForKeyWithBundleAndSubdirectory(key1, [NSBundle mainBundle], nil), key1);`
`10`	`8`	`return YES;`
`11`	`9`	`}`
`12`	`10`
Original file line number	Diff line number	Diff line change
`@@ -4,7 +4,7 @@`
`4`	`4`	`@implementation Module`
`5`	`5`
`6`	`6`	`+ (NSString )fetchLocalizationValueForKey:(NSString )key {`
`7`		`- return SSTStringForKeyWithBundleAndSubdirectory(key, [NSBundle bundleForClass:[Module class]], nil);`
	`7`	`+ return SSTStringForKeyWithBundleAndSubdirectoryAndTargetName(key, [NSBundle bundleForClass:[self class]], nil, @"example_Source_Module_module");`
`8`	`8`	`}`
`9`	`9`
`10`	`10`	`@end`